From 4a0b44cda6be4190a987f49a0971d16573be34b2 Mon Sep 17 00:00:00 2001 From: Bruno Alexandre Rosa <1791393+brunoalr@users.noreply.github.com> Date: Fri, 10 Oct 2025 18:02:22 -0300 Subject: [PATCH] simplify script --- .ci/compile.sh | 12 +----------- .github/workflows/desktop-build.yml | 6 +++--- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/.ci/compile.sh b/.ci/compile.sh index 627e1f885..0f5408d43 100755 --- a/.ci/compile.sh +++ b/.ci/compile.sh @@ -11,8 +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-macos-version sets the min os version - only used for macOS builds -# uses env: BUILDTYPE MAKE_INSTALL MAKE_PACKAGE PACKAGE_TYPE PACKAGE_SUFFIX MAKE_SERVER MAKE_TEST USE_CCACHE CCACHE_SIZE BUILD_DIR CMAKE_GENERATOR +# uses env: BUILDTYPE MAKE_INSTALL MAKE_PACKAGE PACKAGE_TYPE PACKAGE_SUFFIX MAKE_SERVER MAKE_TEST USE_CCACHE CCACHE_SIZE BUILD_DIR CMAKE_GENERATOR TARGET_MACOS_VERSION # (correspond to args: --debug/--release --install --package --suffix --server --test --ccache --dir ) # exitcode: 1 for failure, 3 for invalid arguments @@ -80,15 +79,6 @@ while [[ $# != 0 ]]; do BUILD_DIR="$1" shift ;; - '--target-macos-version') - shift - if [[ $# == 0 ]]; then - echo "::error file=$0::--target-macos-version expects an argument" - exit 3 - fi - TARGET_MACOS_VERSION="$1" - shift - ;; *) echo "::error file=$0::unrecognized option: $1" exit 3 diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml index e8c207c52..b0ffeaf43 100644 --- a/.github/workflows/desktop-build.yml +++ b/.github/workflows/desktop-build.yml @@ -332,9 +332,9 @@ jobs: CMAKE_GENERATOR: '${{env.CMAKE_GENERATOR}}' VCPKG_DISABLE_METRICS: 1 VCPKG_BINARY_SOURCES: 'clear;files,${{ steps.vcpkg-cache.outputs.path }},readwrite' - # if Intel, pass the flag and set to matrix.target, otherwise do nothing - TARGET_MACOS_VERSION_FLAG: ${{ matrix.soc == 'Intel' && format('--target-macos-version {0}', matrix.target) || '' }} - run: .ci/compile.sh --server --test --ccache "$CCACHE_SIZE" --vcpkg ${{ env.TARGET_MACOS_VERSION_FLAG }} + # if Intel, set the target macOS version to matrix.target, otherwise empty string + TARGET_MACOS_VERSION: ${{ matrix.soc == 'Intel' && matrix.target || '' }} + run: .ci/compile.sh --server --test --ccache "$CCACHE_SIZE" --vcpkg - name: Sign app bundle if: matrix.make_package && (github.ref == 'refs/heads/master' || needs.configure.outputs.tag != null)