diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5d44e1eb6..32ec32dfc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -172,7 +172,7 @@ jobs: echo "$MACOS_NOTARIZE_JSON" >/tmp/notarize.json ./build_tools/make_macos_pkg.sh -s -f /tmp/app.p12 \ -i /tmp/installer.p12 -p "$MAC_CODESIGN_PASSWORD" \ - -n -j /tmp/notarize.json + -n -j /tmp/notarize.json -- -c "-DBUILD_DOCS=ON" version=$(git describe) [ -f "${FISH_ARTEFACT_PATH}/fish-$version.app.zip" ] [ -f "${FISH_ARTEFACT_PATH}/fish-$version.pkg" ] diff --git a/build_tools/make_macos_pkg.sh b/build_tools/make_macos_pkg.sh index 1a5ec2691..bf29dcc40 100755 --- a/build_tools/make_macos_pkg.sh +++ b/build_tools/make_macos_pkg.sh @@ -25,9 +25,11 @@ NOTARIZE= ARM64_DEPLOY_TARGET='MACOSX_DEPLOYMENT_TARGET=11.0' X86_64_DEPLOY_TARGET='MACOSX_DEPLOYMENT_TARGET=10.12' +cmake_args= -while getopts "sf:i:p:e:nj:" opt; do +while getopts "c:sf:i:p:e:nj:" opt; do case $opt in + c) cmake_args+=("$OPTARG");; s) SIGN=1;; f) P12_APP_FILE=$(realpath "$OPTARG");; i) P12_INSTALL_FILE=$(realpath "$OPTARG");; @@ -65,6 +67,7 @@ do_cmake() { -DCMAKE_EXE_LINKER_FLAGS="-Wl,-ld_classic" \ -DCMAKE_OSX_ARCHITECTURES='arm64;x86_64' \ -DFISH_USE_SYSTEM_PCRE2=OFF \ + "${cmake_args[@]}" \ "$@" \ "$SRC_DIR" }