Merge pull request #1705 from PolyMC/kaydax/fix-workflow

LennyMcLennington · web-flow · commit 5e5ff30df7eb · 2025-05-13T16:57:53.000+01:00
Fix CI build workflow
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -19,10 +19,10 @@ jobs:
       matrix:
         include:
 
-          - os: ubuntu-20.04
+          - os: ubuntu-22.04
             qt_ver: 5
 
-          - os: ubuntu-20.04
+          - os: ubuntu-22.04
             qt_ver: 6
             qt_host: linux
             qt_version: '6.2.4'
@@ -57,6 +57,7 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     env:
+      CMAKE_POLICY_VERSION_MINIMUM: 3.5
       MACOSX_DEPLOYMENT_TARGET: ${{ matrix.macosx_deployment_target }}
       INSTALL_DIR: "install"
       INSTALL_PORTABLE_DIR: "install-portable"
@@ -105,7 +106,7 @@ jobs:
 
       - name: Setup ccache
         if: runner.os != 'Windows' && inputs.build_type == 'Debug'
-        uses: hendrikmuhs/ccache-action@v1.2.1
+        uses: hendrikmuhs/ccache-action@v1.2.18
         with:
           key: ${{ matrix.os }}-qt${{ matrix.qt_ver }}
 
@@ -127,7 +128,7 @@ jobs:
 
       - name: Retrieve ccache cache (Windows)
         if: runner.os == 'Windows' && inputs.build_type == 'Debug'
-        uses: actions/cache@v3.0.2
+        uses: actions/cache@v3.4.3
         with:
           path: '${{ github.workspace }}\.ccache'
           key: ${{ matrix.os }}-qt${{ matrix.qt_ver }}
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,9 +1,9 @@
 cmake_minimum_required(VERSION 3.15)  # minimum version required by QuaZip
 
-if(WIN32)
-    # In Qt 5.1+ we have our own main() function, don't autolink to qtmain on Windows
-    cmake_policy(SET CMP0020 OLD)
-endif()
+# if(WIN32)
+#     # In Qt 5.1+ we have our own main() function, don't autolink to qtmain on Windows
+#     cmake_policy(SET CMP0020 OLD)
+# endif()
 
 project(Launcher)
 
