diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..2390d8c8 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,10 @@ +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "monthly" + groups: + github-actions: + patterns: + - "*" diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml index 42632c30..9e09faab 100644 --- a/.github/workflows/presubmit.yml +++ b/.github/workflows/presubmit.yml @@ -21,7 +21,7 @@ jobs: run: shell: bash steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: # repository: ${{ github.repository }} (default) fetch-depth: 0 @@ -193,7 +193,7 @@ jobs: echo "CMAKE_CXXFLAGS=-Wall -Wextra -pedantic -Werror -m${{matrix.BIN}} -Wno-missing-field-initializers ${{ matrix.COMPILER.EXCLUSIVE_CXX_FLAGS }}" >> $GITHUB_ENV; - name: Checkout OpenCL-SDK - uses: actions/checkout@v4 + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: fetch-depth: 0 submodules: recursive @@ -429,13 +429,13 @@ jobs: INTEL_OCL_URL: https://github.com/intel/llvm/releases/download/2023-WW27/win-oclcpuexp-2023.16.6.0.28_rel.zip INTEL_TBB_URL: https://github.com/oneapi-src/oneTBB/releases/download/v2021.10.0/oneapi-tbb-2021.10.0-win.zip IMAGE_INTEL_PREFIX: C:\Tools\Intel - VULKAN_SDK_URL: https://sdk.lunarg.com/sdk/download/1.3.261.1/windows/VulkanSDK-1.3.261.1-Installer.exe - VULKAN_SDK: C:/VulkanSDK/1.3.261.1 + VULKAN_SDK_URL: https://sdk.lunarg.com/sdk/download/1.4.350.0/windows/vulkansdk-windows-X64-1.4.350.0.exe + VULKAN_SDK: C:/VulkanSDK/1.4.350.0 steps: - name: Install CMake & Ninja - uses: lukka/get-cmake@v3.26.4 + uses: lukka/get-cmake@a234373d65f7cab3afb0390fbaba1f20a7510fdc # v3.26.4 - name: Update Vcpkg if: matrix.DEPS == 'vcpkg' @@ -467,21 +467,18 @@ jobs: Write-Output "CMAKE_CXXFLAGS=/W4 /EHsc" | Out-File $env:GITHUB_ENV -Append - name: Checkout OpenCL-SDK - uses: actions/checkout@v4 + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: fetch-depth: 0 submodules: recursive - name: Install samples dependencies run: | - Invoke-WebRequest ${env:VULKAN_SDK_URL} -OutFile vulkan-sdk-installer.exe - .\vulkan-sdk-installer.exe --accept-licenses --default-answer --confirm-command install com.lunarg.vulkan.32bit - Remove-Item vulkan-sdk-installer.exe - if ('${{ matrix.BIN }}' -eq 'x64') - { + if ('${{ matrix.BIN }}' -eq 'x64') { + Invoke-WebRequest ${env:VULKAN_SDK_URL} -OutFile vulkan-sdk-installer.exe + .\vulkan-sdk-installer.exe --accept-licenses --default-answer --confirm-command install + Remove-Item vulkan-sdk-installer.exe echo "Vulkan_LIB_DIR=$env:VULKAN_SDK/Lib" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append - } else { - echo "Vulkan_LIB_DIR=$env:VULKAN_SDK/Lib32" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append } - name: Configure (MSBuild) @@ -492,7 +489,13 @@ jobs: } else { $TOOLCHAIN_ARG='' } - $BIN = if('${{matrix.BIN}}' -eq 'x86') {'Win32'} else {'x64'} + if ('${{matrix.BIN}}' -eq 'x64') { + $BIN = 'x64' + $VULKAN_ARG = "-D OPENCL_SDK_BUILD_VULKAN_SAMPLES=ON -D Vulkan_INCLUDE_DIR=${env:VULKAN_SDK}/Include -D Vulkan_LIBRARY=${env:Vulkan_LIB_DIR}/vulkan-1.lib" + } else { + $BIN = 'Win32' + #VULKAN_ARG = '' + } & cmake ` $TOOLCHAIN_ARG ` -G "${{matrix.GEN}}" ` @@ -502,14 +505,12 @@ jobs: -D BUILD_TESTING=ON ` -D OPENCL_SDK_BUILD_SAMPLES=ON ` -D OPENCL_SDK_BUILD_OPENGL_SAMPLES=ON ` - -D OPENCL_SDK_BUILD_VULKAN_SAMPLES=ON ` + $VULKAN_ARG ` -D CMAKE_C_STANDARD=${{matrix.STD.C}} ` -D CMAKE_CXX_STANDARD=${{matrix.STD.CXX}} ` -D CMAKE_C_FLAGS="${env:CMAKE_CFLAGS}" ` -D CMAKE_CXX_FLAGS="${env:CMAKE_CXXFLAGS}" ` -D CMAKE_INSTALL_PREFIX=${env:GITHUB_WORKSPACE}\install ` - -D Vulkan_INCLUDE_DIR=${env:VULKAN_SDK}/Include ` - -D Vulkan_LIBRARY=${env:Vulkan_LIB_DIR}/vulkan-1.lib ` -S ${env:GITHUB_WORKSPACE} ` -B ${env:GITHUB_WORKSPACE}\build if ($LASTEXITCODE -ne 0) { throw "Configuring OpenCL-SDK failed." } @@ -522,6 +523,11 @@ jobs: } else { $TOOLCHAIN_ARG='' } + if ('${{matrix.BIN}}' -eq 'x64') { + $VULKAN_ARG = "-D OPENCL_SDK_BUILD_VULKAN_SAMPLES=ON -D Vulkan_INCLUDE_DIR=${env:VULKAN_SDK}/Include -D Vulkan_LIBRARY=${env:Vulkan_LIB_DIR}/vulkan-1.lib" + } else { + #VULKAN_ARG = '' + } $VER = switch ('${{matrix.VER}}') { ` 'v142' {'14.2'} ` 'v143' {'14.4'} } @@ -535,15 +541,13 @@ jobs: -D BUILD_TESTING=ON ` -D OPENCL_SDK_BUILD_SAMPLES=ON ` -D OPENCL_SDK_BUILD_OPENGL_SAMPLES=ON ` - -D OPENCL_SDK_BUILD_VULKAN_SAMPLES=ON ` + $VULKAN_ARG ` -D CMAKE_C_STANDARD=${{matrix.STD.C}} ` -D CMAKE_CXX_STANDARD=${{matrix.STD.CXX}} ` -D CMAKE_C_FLAGS="${env:CMAKE_CFLAGS}" ` -D CMAKE_CXX_FLAGS="${env:CMAKE_CXXFLAGS}" ` -D CMAKE_EXE_LINKER_FLAGS=/INCREMENTAL ` -D CMAKE_INSTALL_PREFIX=${env:GITHUB_WORKSPACE}\install ` - -D Vulkan_INCLUDE_DIR=${env:VULKAN_SDK}/Include ` - -D Vulkan_LIBRARY=${env:Vulkan_LIB_DIR}/vulkan-1.lib ` -S ${env:GITHUB_WORKSPACE} ` -B ${env:GITHUB_WORKSPACE}\build if ($LASTEXITCODE -ne 0) { throw "Configuring OpenCL-SDK failed." } @@ -686,7 +690,7 @@ jobs: CXX: /usr/bin/clang++ steps: - name: Checkout OpenCL-SDK - uses: actions/checkout@v4 + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: fetch-depth: 0 submodules: recursive @@ -706,7 +710,7 @@ jobs: run: brew install tclap glm glew sfml mesa-glu - name: Install CMake & Ninja - uses: lukka/get-cmake@v3.26.4 + uses: lukka/get-cmake@a234373d65f7cab3afb0390fbaba1f20a7510fdc # v3.26.4 - name: Install Vcpkg if: matrix.DEPS == 'vcpkg' @@ -805,7 +809,7 @@ jobs: os: [ubuntu-latest] runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 - name: Environment setup run: | MINIFORGE_INSTALL_DIR=.miniforge3 @@ -843,9 +847,9 @@ jobs: strategy: matrix: #os: [ubuntu-latest, macos-latest] - os: [ubuntu-latest, macos-13] + os: [ubuntu-latest] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: fetch-depth: 0 submodules: recursive @@ -885,7 +889,7 @@ jobs: CXXFLAGS: -Wall -Wextra -pedantic -Werror -Wno-error=missing-field-initializers steps: - name: Checkout OpenCL-SDK - uses: actions/checkout@v4 + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: fetch-depth: 0 submodules: recursive @@ -915,7 +919,7 @@ jobs: needs: format steps: - name: Checkout OpenCL-SDK - uses: actions/checkout@v4 + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: fetch-depth: 0 submodules: recursive diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 719bcc6a..3ce740b4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,7 +23,7 @@ jobs: MultiProcMaxCount: 3 steps: - name: Checkout OpenCL-SDK - uses: actions/checkout@v4 + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: fetch-depth: 0 submodules: recursive @@ -77,7 +77,7 @@ jobs: if ($LASTEXITCODE -ne 0) { throw "Packaging OpenCL-SDK failed." } - name: Upload - uses: softprops/action-gh-release@v2 + uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda # v3.0.0 with: draft: true token: ${{ secrets.ACTIONS_CREATE_RELEASE_TOKEN }} @@ -99,7 +99,7 @@ jobs: steps: - name: Checkout OpenCL-SDK - uses: actions/checkout@v4 + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: fetch-depth: 0 submodules: recursive @@ -150,7 +150,7 @@ jobs: if ($LASTEXITCODE -ne 0) { throw "Packaging OpenCL-SDK source failed." } - name: Upload - uses: softprops/action-gh-release@v2 + uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda # v3.0.0 with: draft: true token: ${{ secrets.ACTIONS_CREATE_RELEASE_TOKEN }} diff --git a/external/OpenCL-CLHPP b/external/OpenCL-CLHPP index 2a608428..5661a0ef 160000 --- a/external/OpenCL-CLHPP +++ b/external/OpenCL-CLHPP @@ -1 +1 @@ -Subproject commit 2a608428f725cad7903ef55e1ce5b995895838f5 +Subproject commit 5661a0efc215b1e05d3b90315c64f670101fdbde diff --git a/external/OpenCL-Headers b/external/OpenCL-Headers index 8a97ebc8..6fe718c3 160000 --- a/external/OpenCL-Headers +++ b/external/OpenCL-Headers @@ -1 +1 @@ -Subproject commit 8a97ebc88daa3495d6f57ec10bb515224400186f +Subproject commit 6fe718c31a45fe25151362a72ef041c3a1047cbd diff --git a/external/OpenCL-ICD-Loader b/external/OpenCL-ICD-Loader index ad770a1b..b7bd2803 160000 --- a/external/OpenCL-ICD-Loader +++ b/external/OpenCL-ICD-Loader @@ -1 +1 @@ -Subproject commit ad770a1b64c6b8d5f2ed4e153f22e4f45939f27f +Subproject commit b7bd2803acc779c03d96588e9ca9e9568a18698a