From f3420a0b8fb06512b28a9a5338d91755df311607 Mon Sep 17 00:00:00 2001 From: Anthony Bilinski Date: Thu, 3 Mar 2022 03:04:24 -0800 Subject: [PATCH] chore(CI): macOS CI script support for both full dep build or just qTox build --- .../{build-osx.sh => build-qtox-macos.sh} | 21 ++++++++++++++++++- .github/workflows/build-test-deploy.yaml | 2 +- 2 files changed, 21 insertions(+), 2 deletions(-) rename .ci-scripts/{build-osx.sh => build-qtox-macos.sh} (68%) diff --git a/.ci-scripts/build-osx.sh b/.ci-scripts/build-qtox-macos.sh similarity index 68% rename from .ci-scripts/build-osx.sh rename to .ci-scripts/build-qtox-macos.sh index f78ba048e..ef28b76ef 100755 --- a/.ci-scripts/build-osx.sh +++ b/.ci-scripts/build-qtox-macos.sh @@ -20,12 +20,31 @@ set -eu -o pipefail readonly BIN_NAME="qTox.dmg" +SCRIPT_DIR=$(dirname $(realpath "$0")) + +source "${SCRIPT_DIR}/../buildscripts/build_utils.sh" + +# kind of a hack.. but we want to extract DEP_PREFIX from it +parse_arch --arch macos --supported macos --dep macos + +if [ "$1" == "user" ]; then + DEPLOYMENT_TARGET="" + PREFIX_PATH="$(brew --prefix qt@5)" +elif [ "$1" == "dist" ]; then + DEPLOYMENT_TARGET="-DCMAKE_OSX_DEPLOYMENT_TARGET=$MACOS_MINIMUM_SUPPORTED_VERSION" + PREFIX_PATH="$DEP_PREFIX;$(brew --prefix qt@5)" +else + echo "Unknown arg $1" + exit 1 +fi + build_qtox() { cmake -DUPDATE_CHECK=ON \ -DSPELL_CHECK=OFF \ -DSTRICT_OPTIONS=ON \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_PREFIX_PATH="$(brew --prefix qt@5)" . + "${DEPLOYMENT_TARGET}" \ + "-DCMAKE_PREFIX_PATH=${PREFIX_PATH}" . make -j$(sysctl -n hw.ncpu) export CTEST_OUTPUT_ON_FAILURE=1 ctest -j$(sysctl -n hw.ncpu) diff --git a/.github/workflows/build-test-deploy.yaml b/.github/workflows/build-test-deploy.yaml index d2f8da996..bd4b5ec16 100644 --- a/.github/workflows/build-test-deploy.yaml +++ b/.github/workflows/build-test-deploy.yaml @@ -517,7 +517,7 @@ jobs: - name: Install toxcore and toxext run: buildscripts/build_toxcore_linux.sh - name: Build qTox - run: ./.ci-scripts/build-osx.sh + run: ./.ci-scripts/build-qtox-macos.sh user - name: Upload dmg uses: actions/upload-artifact@v2 with: