ci: try fixing qt5 builds on macos-14

Neverous · Feb 8, 2024 · 2aa44d7 · 2aa44d7
1 parent a66eb0d
commit 2aa44d7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 46 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -93,7 +93,7 @@ jobs:
               export CXX=g++
             ;;
           esac;
-          cmake -DCMAKE_BUILD_TYPE=${{ inputs.build-config }} -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache ..
+          cmake -DCMAKE_BUILD_TYPE=${{ inputs.build-config }} -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache ${{ inputs.os == 'macos-14' && matrix.qt-version.startsWith('5') && '-DCMAKE_OSX_ARCHITECTURES="x86_64"' || '' }} ..
         shell: bash
         env:
           BUILD_VERSION: ${{ inputs.version }}

diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml
@@ -13,56 +13,12 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build-linux:
-    name: ${{ matrix.os }} with ${{ matrix.compiler }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-20.04, ubuntu-22.04]
-        compiler:
-          - Clang
-          - GCC
-
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    uses: ./.github/workflows/build.yml
-    with:
-      os: ${{ matrix.os }}
-      compiler: ${{ matrix.compiler }}
-      build-config: Debug
-      version: ${{ github.sha }}
-
-  build-windows:
-    name: ${{ matrix.os }} with ${{ matrix.compiler }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [windows-2019, windows-2022]
-        compiler:
-          - Clang
-          - MSVC
-
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    uses: ./.github/workflows/build.yml
-    with:
-      os: ${{ matrix.os }}
-      compiler: ${{ matrix.compiler }}
-      build-config: Debug
-      version: ${{ github.sha }}
-
   build-macos:
     name: ${{ matrix.os }} with ${{ matrix.compiler }}
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-11, macos-12, macos-13, macos-14]
+        os: [macos-14]
         compiler:
           - Clang