Use a multi-step build for CI

Signed-off-by: falkTX <falktx@falktx.com>
falkTX · Jun 5, 2023 · 46c2870 · 46c2870
1 parent 6c5b06f
commit 46c2870
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -22,6 +22,7 @@ jobs:
         with:
           submodules: recursive
       - name: Set up cache
+        id: cache
         uses: actions/cache@v3
         with:
           path: |
@@ -39,6 +40,7 @@ jobs:
           ./PawPaw/bootstrap-qt.sh macos-universal
           ./PawPaw/.cleanup.sh macos-universal
       - name: Build macOS universal
+        if: steps.cache.outputs.cache-hit == 'true'
         shell: bash
         run: |
           source PawPaw/local.env macos-universal
@@ -66,6 +68,7 @@ jobs:
         with:
           submodules: recursive
       - name: Set up cache
+        id: cache
         uses: actions/cache@v3
         with:
           path: |
@@ -99,12 +102,14 @@ jobs:
           ./PawPaw/bootstrap-qt.sh win32
           ./PawPaw/.cleanup.sh win32
       - name: Build win32 cross-compiled
+        if: steps.cache.outputs.cache-hit == 'true'
         shell: bash
         run: |
           source PawPaw/local.env win32
           cmake -S . -B build
           $(which cmake) --build build -j $(nproc)
       - name: Create zip package
+        if: steps.cache.outputs.cache-hit == 'true'
         shell: bash
         run: |
           source PawPaw/local.env win32
@@ -134,6 +139,7 @@ jobs:
         with:
           submodules: recursive
       - name: Set up cache
+        id: cache
         uses: actions/cache@v3
         with:
           path: |
@@ -167,12 +173,14 @@ jobs:
           ./PawPaw/bootstrap-qt.sh win64
           ./PawPaw/.cleanup.sh win64
       - name: Build win64 cross-compiled
+        if: steps.cache.outputs.cache-hit == 'true'
         shell: bash
         run: |
           source PawPaw/local.env win64
           cmake -S . -B build
           $(which cmake) --build build -j $(nproc)
       - name: Create zip package
+        if: steps.cache.outputs.cache-hit == 'true'
         shell: bash
         run: |
           source PawPaw/local.env win64

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -25,7 +25,6 @@ if(NOT (APPLE OR MINGW OR WIN32))
   find_package(Qt5 COMPONENTS REQUIRED X11Extras)
 else()
   set(X11_FOUND FALSE)
-  mark_as_advanced(X11_FOUND)
 endif()
 
 #######################################################################################################################