From f7b7c62376d123ef699a040c2eca92ac86b6b8b0 Mon Sep 17 00:00:00 2001 From: Bruno Alexandre Rosa <1791393+brunoalr@users.noreply.github.com> Date: Fri, 3 Oct 2025 18:28:21 -0300 Subject: [PATCH] adress initial reviews --- .ci/compile.sh | 14 +++++++++----- .github/workflows/desktop-build.yml | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.ci/compile.sh b/.ci/compile.sh index 76f0e0bcd..14ec88146 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" -# --target-x86-macos sets the min os version to 13.0 - only used for Intel builds +# --target-macos-version sets the min os version - only used for macOS # 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,13 @@ while [[ $# != 0 ]]; do BUILD_DIR="$1" shift ;; - '--target-x86-macos') + '--target-macos-version') shift - TARGET_X86_MACOS=1 + if [[ $# == 0 ]]; then + echo "::error file=$0::--target-macos-version expects an argument" + exit 3 + fi + TARGET_MACOS_VERSION="$1" shift ;; *) @@ -122,8 +126,8 @@ fi if [[ $PACKAGE_TYPE ]]; then flags+=("-DCPACK_GENERATOR=$PACKAGE_TYPE") fi -if [[ $TARGET_X86_MACOS ]]; then - flags+=("-DCMAKE_OSX_DEPLOYMENT_TARGET=13.0") + if [[ $TARGET_MACOS_VERSION ]]; then + flags+=("-DCMAKE_OSX_DEPLOYMENT_TARGET=$TARGET_MACOS_VERSION") flags+=("-DVCPKG_TARGET_TRIPLET=x64-osx-13") flags+=("-DVCPKG_OVERLAY_TRIPLETS=../cmake/triplets") fi diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml index 79fba3aa0..6520546f7 100644 --- a/.github/workflows/desktop-build.yml +++ b/.github/workflows/desktop-build.yml @@ -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' && '--target-x86-macos' || '' }} + run: .ci/compile.sh --server --test --ccache "$CCACHE_SIZE" ${{ matrix.soc == 'Intel' && '--target-macos-version 13.0' || '' }} - name: Sign app bundle if: matrix.make_package && (github.ref == 'refs/heads/master' || needs.configure.outputs.tag != null)