testing builds

turanszkij · Jan 18, 2025 · dd9dcb2 · dd9dcb2
1 parent dff1938
commit dd9dcb2
Showing 1 changed file with 22 additions and 58 deletions.
diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
@@ -3,58 +3,25 @@ name: Pull Request Verification
 on:
   pull_request
 
+concurrency:
+  group: ${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
 
-  windows:
-    runs-on: windows-latest
+  upx:
+    runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-    - name: Initial compile
-      shell: cmd
-      run: |
-        "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/MSBuild/Current/Bin/MSBuild.exe" WickedEngine.sln /t:OfflineShaderCompiler /m /p:Configuration=Release /p:Platform=x64
-    - name: Generate shader dump
-      shell: cmd
-      run: |
-        cd "WickedEngine"
-        "../BUILD/x64/Release/OfflineShaderCompiler/OfflineShaderCompiler.exe" hlsl6 spirv shaderdump strip_reflection
-    - name: Recompile with shader dump
-      shell: cmd
-      run: |
-        "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/MSBuild/Current/Bin/MSBuild.exe" WickedEngine.sln /t:clean /m /p:Configuration=Release /p:Platform=x64
-        "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/MSBuild/Current/Bin/MSBuild.exe" WickedEngine.sln /t:Editor_Windows /m /p:Configuration=Release /p:Platform=x64
-
-    - name: Move files
-      shell: cmd
-      run: |
-        move BUILD\x64\Release\Editor_Windows\Editor_Windows.exe .\
-        move Editor\config.ini .\
-        move Editor\startup.lua .\
-        move Editor\languages .\
-        move Editor\fonts .\
-
-    - name: Install UPX
-      shell: cmd
-      run: choco install --no-progress upx
-
-    - name: Compress Editor with UPX
-      shell: cmd
-      run: upx --best Editor_Windows.exe
+      - run: wget https://github.com/upx/upx/releases/download/v4.2.4/upx-4.2.4-amd64_linux.tar.xz -O upx.tar.xz
+      - run: tar xf upx.tar.xz
+      - run: ln -s upx-4.2.4-amd64_linux/upx
+      - run: ./upx --version
+  test:
+    runs-on: ubuntu-24.04
+    strategy:
+        matrix:
+            version: [12, 13, 14]
 
-    - name: Package Editor
-      uses: actions/upload-artifact@v4
-      with:
-        name: Editor (Windows)
-        path: |
-          languages/
-          fonts/
-          config.ini
-          startup.lua
-          Editor_Windows.exe
-
-
-  linux:
-    runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
 
@@ -63,19 +30,19 @@ jobs:
       uses: actions/cache/restore@v4
       with:
         path: ~/.cache/ccache
-        key: ccache-${{ github.run_id }}
+        key: ccache-${{ github.run_id }}-${{ matrix.version }}
         restore-keys: ccache
 
     - name: Install dependencies
       run: |
         sudo apt update
-        sudo apt install libsdl2-dev ccache
+        sudo apt install --no-install-recommends libsdl2-dev ccache
 
     - name: Initial compile
       run: |
         mkdir build
         cd build
-        cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
+        CC=gcc-${{ matrix.version }} CXX=g++-${{ matrix.version }} cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
         CCACHE_NODIRECT=1 make -j$(nproc)
 
     - name: Generate shader dump
@@ -84,7 +51,7 @@ jobs:
         ./offlineshadercompiler spirv rebuild shaderdump
         mv wiShaderDump.h ../../WickedEngine/
 
-    - name: Recompile with shader dump
+    - name: Compile with shader dump
       run: |
         cd build
         CCACHE_NODIRECT=1 make -B -j $(nproc)
@@ -99,25 +66,22 @@ jobs:
 
     - name: Move binaries
       run: |
-        mv build/Editor/WickedEngineEditor ./Editor_Linux
+        mv build/Editor/WickedEngineEditor ./Editor_Linux-${{ matrix.version }}
         mv Editor/config.ini ./
         mv Editor/startup.lua ./
         mv Editor/languages ./
         mv Editor/fonts ./
 
-    - name: Compress Editor with UPX
-      run: upx --best Editor_Linux
-
     - name: Package Editor
       uses: actions/upload-artifact@v4
       with:
-        name: Editor (Linux)
+        name: test-${{ matrix.version }}
         path: |
           languages/
           fonts/
           config.ini
           startup.lua
-          Editor_Linux
+          Editor_Linux-${{ matrix.version }}
 
   content:
     runs-on: windows-latest