update github actions tests

ucpu · Jan 5, 2024 · 0bddb0d · 0bddb0d
1 parent 41afa08
commit 0bddb0d
Showing 1 changed file with 13 additions and 48 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os-version: [2019, 2022]
+        os-version: [2022]
         build-config: [debug, release, relwithdebinfo]
         build-arch: [Win32, x64]
         build-tool: ["", "-T ClangCL"]
@@ -40,6 +40,11 @@ jobs:
         cd build
         cmake --build . --config ${{ matrix.build-config }}
 
+    - name: Assets
+      run: |
+        cd build/result/${{ matrix.build-config }}
+        ./cage-asset-database
+
 
   Ubuntu:
     name: ubuntu-${{ matrix.os-version }}-${{ matrix.build-config }}-${{ matrix.compiler.cc }}
@@ -59,19 +64,14 @@ jobs:
             install: gcc-12 g++-12
           }
         - {
-            cc: clang-12,
-            cxx: clang++-12,
-            install: clang-12
+            cc: gcc-13,
+            cxx: g++-13,
+            install: gcc-13 g++-13
           }
         - {
-            cc: clang-13,
-            cxx: clang++-13,
-            install: clang-13
-          }
-        - {
-            cc: clang-14,
-            cxx: clang++-14,
-            install: clang-14
+            cc: clang-15,
+            cxx: clang++-15,
+            install: clang-15
           }
 
     steps:
@@ -83,9 +83,9 @@ jobs:
     - name: Versions
       run: |
         cmake --version
+        git --version
         ${{ matrix.compiler.cc }} --version
         ${{ matrix.compiler.cxx }} --version
-        git --version
 
     - uses: actions/checkout@v3
       with:
@@ -102,41 +102,6 @@ jobs:
         cd build
         cmake --build . --config ${{ matrix.build-config }} -- -j3
 
-
-  Assets:
-    name: Assets
-    runs-on: ubuntu-22.04
-    env:
-      CC: ${{ matrix.compiler.cc }}
-      CXX: ${{ matrix.compiler.cxx }}
-    strategy:
-      fail-fast: false
-      matrix:
-        build-config: [release]
-        compiler:
-        - {
-            cc: gcc-12,
-            cxx: g++-12,
-            install: gcc-12 g++-12
-          }
-
-    steps:
-    - name: Install packages
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y xorg-dev nasm ${{ matrix.compiler.install }}
-
-    - uses: actions/checkout@v3
-      with:
-        submodules: recursive
-
-    - name: Configure and Build
-      run: |
-        mkdir build
-        cd build
-        cmake -DCMAKE_BUILD_TYPE=${{ matrix.build-config }} ..
-        cmake --build . --config ${{ matrix.build-config }} -- -j3
-
     - name: Assets
       run: |
         cd build/result/${{ matrix.build-config }}