vk-gl-cts on cmake

expipiplus1 · Jul 8, 2024 · 44c60b9 · 44c60b9
1 parent aae647f
commit 44c60b9
Showing 1 changed file with 36 additions and 14 deletions.
diff --git a/.github/workflows/vk-gl-cts-nightly.yml b/.github/workflows/vk-gl-cts-nightly.yml
@@ -10,22 +10,44 @@ env:
   DISABLE_CTS_SLANG: 0
 jobs:
   build:
-    runs-on: [Windows, self-hosted]
+    strategy:
+      matrix:
+        include:
+          # Self-hosted falcor tests
+          - os: windows
+            compiler: cl
+            platform: x86_64
+            config: release
+            warnings-as-errors: false
+            test-category: full
+            full-gpu-tests: false
+            runs-on: [Windows, self-hosted]
     timeout-minutes: 180
+    defaults:
+      run:
+        shell: bash
     steps:
     - uses: actions/checkout@v4
       with:
         submodules: 'true'
         fetch-depth: '0'
-    - name: setup-msbuild
-      uses: microsoft/setup-msbuild@v1
-    - name: build slang
+    - name: Setup
+      uses: ./.github/actions/common-setup
+      with:
+        os: ${{matrix.os}}
+        compiler: ${{matrix.compiler}}
+        platform: ${{matrix.platform}}
+        config: ${{matrix.config}}
+    - name: Build Slang
       run: |
-        .\premake.bat vs2019 --arch=x64 --deps=true --no-progress=true --enable-cuda=true
-        
-        .\make-slang-tag-version.bat
-        
-        MSBuild.exe slang.sln -v:m -m -property:Configuration=Release -property:Platform=x64 -property:WindowsTargetPlatformVersion=10.0.19041.0 -maxcpucount:12
+        cmake --preset default --fresh \
+          -DSLANG_SLANG_LLVM_FLAVOR=USE_SYSTEM_LLVM \
+          -DCMAKE_COMPILE_WARNING_AS_ERROR=${{matrix.warnings-as-errors}} \
+          -DSLANG_ENABLE_CUDA=1 \
+          -DSLANG_ENABLE_EXAMPLES=0 \
+          -DSLANG_ENABLE_GFX=0 \
+          -DSLANG_ENABLE_TESTS=1
+        cmake --workflow --preset "${{matrix.config}}"
     - uses: robinraju/release-downloader@v1.7
       with:
         latest: true
@@ -40,19 +62,19 @@ jobs:
         path: test-lists
         sparse-checkout-cone-mode: false
     - name: vkcts setup
+      shell: pwsh
       run: |
         Expand-Archive VK-GL-CTS_WithSlang-0.0.3-win64.zip
         
-        copy ${{ github.workspace }}\bin\windows-x64\release\slang.dll ${{ github.workspace }}\VK-GL-CTS_WithSlang-0.0.3-win64\VK-GL-CTS_WithSlang-0.0.3-win64\slang.dll
-
-        copy ${{ github.workspace }}\bin\windows-x64\release\slang-glslang.dll ${{ github.workspace }}\VK-GL-CTS_WithSlang-0.0.3-win64\VK-GL-CTS_WithSlang-0.0.3-win64\slang-glslang.dll
+        copy ${{ github.workspace }}\build\Release\bin\slang.dll ${{ github.workspace }}\VK-GL-CTS_WithSlang-0.0.3-win64\VK-GL-CTS_WithSlang-0.0.3-win64\slang.dll
+        copy ${{ github.workspace }}\build\Release\bin\slang-glslang.dll ${{ github.workspace }}\VK-GL-CTS_WithSlang-0.0.3-win64\VK-GL-CTS_WithSlang-0.0.3-win64\slang-glslang.dll
+        copy ${{ github.workspace }}\build\Release\bin\test-server.exe ${{ github.workspace }}\VK-GL-CTS_WithSlang-0.0.3-win64\VK-GL-CTS_WithSlang-0.0.3-win64\test-server.exe
 
         copy ${{ github.workspace }}\test-lists\test-lists\slang-passing-tests.txt ${{ github.workspace }}\VK-GL-CTS_WithSlang-0.0.3-win64\VK-GL-CTS_WithSlang-0.0.3-win64\slang-passing-tests.txt
-
         copy ${{ github.workspace }}\test-lists\test-lists\slang-waiver-tests.xml ${{ github.workspace }}\VK-GL-CTS_WithSlang-0.0.3-win64\VK-GL-CTS_WithSlang-0.0.3-win64\slang-waiver-tests.xml
 
-        copy ${{ github.workspace }}\bin\windows-x64\release\test-server.exe ${{ github.workspace }}\VK-GL-CTS_WithSlang-0.0.3-win64\VK-GL-CTS_WithSlang-0.0.3-win64\test-server.exe
     - name: vkcts run
+      shell: pwsh
       working-directory: ${{ github.workspace }}\VK-GL-CTS_WithSlang-0.0.3-win64\VK-GL-CTS_WithSlang-0.0.3-win64
       run: |
         .\deqp-vk.exe --deqp-archive-dir=${{ github.workspace }}\VK-GL-CTS_WithSlang-0.0.3-win64\VK-GL-CTS_WithSlang-0.0.3-win64 --deqp-caselist-file=${{ github.workspace }}\VK-GL-CTS_WithSlang-0.0.3-win64\VK-GL-CTS_WithSlang-0.0.3-win64\slang-passing-tests.txt --deqp-waiver-file=${{ github.workspace }}\VK-GL-CTS_WithSlang-0.0.3-win64\VK-GL-CTS_WithSlang-0.0.3-win64\slang-waiver-tests.xml