testing builds

turanszkij · Jan 17, 2025 · 08eee17 · 08eee17
1 parent dff1938
commit 08eee17
Showing 1 changed file with 12 additions and 74 deletions.
diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
@@ -5,67 +5,15 @@ on:
 
 jobs:
 
-  windows:
-    runs-on: windows-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
+  test:
+    runs-on: ubuntu-24.04
+    strategy:
+        matrix:
+            version: [12, 13, 14]
 
-    - name: Compress Editor with UPX
-      shell: cmd
-      run: upx --best Editor_Windows.exe
-
-    - 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
 
-    - name: Restore CCache database
-      id: restore-ccache
-      uses: actions/cache/restore@v4
-      with:
-        path: ~/.cache/ccache
-        key: ccache-${{ github.run_id }}
-        restore-keys: ccache
-
     - name: Install dependencies
       run: |
         sudo apt update
@@ -75,39 +23,29 @@ jobs:
       run: |
         mkdir build
         cd build
-        cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
-        CCACHE_NODIRECT=1 make -j$(nproc)
+        CC=gcc-${{ matrix.version }} CXX=g++-${{ matrix.version }} cmake .. -DCMAKE_BUILD_TYPE=Release
+        make -j$(nproc)
 
     - name: Generate shader dump
       run: |
         cd build/WickedEngine
         ./offlineshadercompiler spirv rebuild shaderdump
         mv wiShaderDump.h ../../WickedEngine/
 
-    - name: Recompile with shader dump
+    - name: Compile with shader dump
       run: |
+        touch WickedEngine/wiRenderer.cpp
         cd build
-        CCACHE_NODIRECT=1 make -B -j $(nproc)
-
-    - name: Save Ccache database
-      id: save-ccache
-      if: always() && steps.restore-ccache.cache-hit != 'true'
-      uses: actions/cache/save@v4
-      with:
-        path: ~/.cache/ccache
-        key: ${{ steps.restore-ccache.outputs.cache-primary-key }}
+        make -j $(nproc)
 
     - 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:
@@ -117,7 +55,7 @@ jobs:
           fonts/
           config.ini
           startup.lua
-          Editor_Linux
+          Editor_Linux-${{ matrix.version }}
 
   content:
     runs-on: windows-latest