diff --git a/.ci/compile.sh b/.ci/compile.sh index b618547b4..76f0e0bcd 100755 --- a/.ci/compile.sh +++ b/.ci/compile.sh @@ -11,7 +11,7 @@ # --debug or --release sets the build type ie CMAKE_BUILD_TYPE # --ccache [] uses ccache and shows stats, optionally provide size # --dir sets the name of the build dir, default is "build" -# --x86-macos sets the min os version to 13.0 - only used for Intel builds +# --target-x86-macos sets the min os version to 13.0 - only used for Intel builds # uses env: BUILDTYPE MAKE_INSTALL MAKE_PACKAGE PACKAGE_TYPE PACKAGE_SUFFIX MAKE_SERVER MAKE_TEST USE_CCACHE CCACHE_SIZE BUILD_DIR CMAKE_GENERATOR # (correspond to args: --debug/--release --install --package --suffix --server --test --ccache --dir ) # exitcode: 1 for failure, 3 for invalid arguments @@ -76,9 +76,9 @@ while [[ $# != 0 ]]; do BUILD_DIR="$1" shift ;; - '--x86-macos') + '--target-x86-macos') shift - X86_MACOS=1 + TARGET_X86_MACOS=1 shift ;; *) @@ -122,7 +122,7 @@ fi if [[ $PACKAGE_TYPE ]]; then flags+=("-DCPACK_GENERATOR=$PACKAGE_TYPE") fi -if [[ $X86_MACOS ]]; then +if [[ $TARGET_X86_MACOS ]]; then flags+=("-DCMAKE_OSX_DEPLOYMENT_TARGET=13.0") flags+=("-DVCPKG_TARGET_TRIPLET=x64-osx-13") flags+=("-DVCPKG_OVERLAY_TRIPLETS=../cmake/triplets") diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml index 913d8c910..79fba3aa0 100644 --- a/.github/workflows/desktop-build.yml +++ b/.github/workflows/desktop-build.yml @@ -293,7 +293,7 @@ jobs: - name: Install Qt ${{env.QT_VERSION}} uses: jurplel/install-qt-action@v4 with: - cache: true # qt caches take too much space for macOS (1.1Gi) + cache: false # qt caches take too much space for macOS (1.1Gi) version: ${{env.QT_VERSION}} arch: ${{env.QT_ARCH}} modules: ${{env.QT_MODULES}} @@ -318,7 +318,7 @@ jobs: CMAKE_GENERATOR: '${{env.CMAKE_GENERATOR}}' VCPKG_DISABLE_METRICS: 1 VCPKG_BINARY_SOURCES: 'clear;files,${{ steps.vcpkg-cache.outputs.path }},readwrite' - run: .ci/compile.sh --server --test --ccache "$CCACHE_SIZE" ${{ matrix.soc == 'Intel' && '--x86-macos' || '' }} + run: .ci/compile.sh --server --test --ccache "$CCACHE_SIZE" ${{ matrix.soc == 'Intel' && '--target-x86-macos' || '' }} - name: Sign app bundle if: matrix.make_package && (github.ref == 'refs/heads/master' || needs.configure.outputs.tag != null)