diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index de67fe6a..d359db6c 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -180,6 +180,7 @@ jobs: shell: bash if: contains(matrix.os, 'macos') run: | + export MACOSX_DEPLOYMENT_TARGET=10.14 scripts/fetch_deps.sh source cutter-deps/env.sh set -euo pipefail diff --git a/scripts/fetch_deps.sh b/scripts/fetch_deps.sh index 42484a0a..4079c6aa 100755 --- a/scripts/fetch_deps.sh +++ b/scripts/fetch_deps.sh @@ -4,16 +4,16 @@ cd $(dirname "${BASH_SOURCE[0]}")/.. mkdir -p cutter-deps && cd cutter-deps LINUX_FILE="cutter-deps-linux.tar.gz" -LINUX_MD5=6cd6dff0b5e33d5ff62c57b4400603f5 -LINUX_URL=https://github.com/rizinorg/cutter-deps/releases/download/v13/cutter-deps-linux.tar.gz +LINUX_MD5=eb2710548d951823e6b5340c33c8fc99 +LINUX_URL=https://github.com/rizinorg/cutter-deps/releases/download/v14/cutter-deps-linux.tar.gz MACOS_FILE="cutter-deps-macos.tar.gz" -MACOS_MD5=4a7fe127d99dc6087c290d828aa19f6b -MACOS_URL=https://github.com/rizinorg/cutter-deps/releases/download/v13/cutter-deps-macos.tar.gz +MACOS_MD5=f921c007430eec38b06acef8cc0fe42a +MACOS_URL=https://github.com/rizinorg/cutter-deps/releases/download/v14/cutter-deps-macos.tar.gz WIN_FILE="cutter-deps-win.tar.gz" -WIN_MD5=d867df10fb0c2b029faf737453014da6 -WIN_URL=https://github.com/rizinorg/cutter-deps/releases/download/v13/cutter-deps-win.tar.gz +WIN_MD5=09aa544e62cdd786df3598f1ff340f9e +WIN_URL=https://github.com/rizinorg/cutter-deps/releases/download/v14/cutter-deps-win.tar.gz if [ "$OS" == "Windows_NT" ]; then FILE="${WIN_FILE}" diff --git a/scripts/prepare_breakpad_macos.sh b/scripts/prepare_breakpad_macos.sh index 0a790f4e..9c1e2683 100755 --- a/scripts/prepare_breakpad_macos.sh +++ b/scripts/prepare_breakpad_macos.sh @@ -14,8 +14,8 @@ mkdir $BREAKPAD_DUMP_SYMS_DIR cd breakpad git checkout 4d550cceca107f36c4bc1ea1126b7d32cc50f424 git apply "$SCRIPTPATH/breakpad_macos.patch" -cd src/client/mac/ && xcodebuild -sdk macosx -cp -R build/Release/Breakpad.framework "$BREAKPAD_FRAMEWORK_DIR" +cd src/client/mac/ && xcodebuild -sdk macosx MACOSX_DEPLOYMENT_TARGET=10.14 +cp -R build/Release/Breakpad.framework "$BREAKPAD_FRAMEWORK_DIR" cd $DIR/breakpad cp -R src/. framework/Breakpad.framework/Headers