Merge pull request #38 from johnnynunez/next

ARM CI & VULKAN SDK ARM & CUDA SBSA ARM
LuisaGroup · Feb 17, 2025 · cb8b8a9 · cb8b8a9
2 parents 9b169f3 + 1ee12f7
commit cb8b8a9
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -58,12 +58,12 @@ jobs:
           sudo apt-get update
           sudo apt-get -y install cuda-12.8
           sudo apt-get -y clean # save some space
-#      - name: "Setup Vulkan SDK"
-#        uses: humbletim/setup-vulkan-sdk@v1.2.0
-#        with:
-#          vulkan-query-version: 1.3.204.0
-#          vulkan-components: Vulkan-Headers, Vulkan-Loader
-#          vulkan-use-cache: true
+      - name: "Setup Vulkan SDK"
+        uses: johnnynunez/setup-vulkan-sdk@v1
+        with:
+          vulkan-query-version: 1.4.304.1
+          vulkan-components: Vulkan-Headers, Vulkan-Loader
+          vulkan-use-cache: true
       - name: "Configure and Build"
         run: |
           if [ "${{ matrix.compiler.name }}" = "gcc" ]; then
@@ -92,7 +92,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ macos-13, macos-14, macos-15 ]
+        os: [ macos-13, macos-15 ]
         compiler: [ homebrew-clang ]
         config: [ Release, Debug ]
     name: "${{ matrix.os }} / ${{ matrix.config }} / ${{ matrix.compiler }}"
@@ -130,7 +130,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ 2019, 2022 ]
+        os: [ 2019, 2025 ]
         config: [ Release, Debug ]
         compiler: [ cl, clang, clang-cl ]
     name: "windows-${{ matrix.os }} / ${{ matrix.config }} / ${{ matrix.compiler }}"
@@ -142,24 +142,24 @@ jobs:
       - name: "Setup CUDA"
         uses: Jimver/cuda-toolkit@master
         with:
-          cuda: 12.1.0
+          cuda: 12.8.0
       - name: "Setup Ninja"
         uses: ashutoshvarma/setup-ninja@master
         with:
           version: 1.11.1
       - name: "Setup Vulkan SDK"
-        uses: humbletim/setup-vulkan-sdk@v1.2.0
+        uses: johnnynunez/setup-vulkan-sdk@v1
         with:
-          vulkan-query-version: 1.3.204.0
+          vulkan-query-version: 1.4.304.1
           vulkan-components: Vulkan-Headers, Vulkan-Loader
           vulkan-use-cache: true
       - name: "Configure and Build"
         shell: cmd
         run: |
           if "${{ matrix.os }}" == "2019" (
-            call "C:\Program Files (x86)\Microsoft Visual Studio\${{ matrix.os }}\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+            call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
           ) else (
-            call "C:\Program Files\Microsoft Visual Studio\${{ matrix.os }}\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+            call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
           )
           cmake -S . -G Ninja -B build -D CMAKE_BUILD_TYPE=${{ matrix.config }} -D CMAKE_C_COMPILER:FILEPATH=${{ matrix.compiler }}.exe -D CMAKE_CXX_COMPILER:FILEPATH=${{ matrix.compiler }}.exe
           cmake --build build