Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-08-16 08:34:10 +02:00
Code Issues Releases Wiki Activity

Correct MacOS CPack configuration (#334)

Browse Source 
* Make the `repeat_hdiutil.sh` script more clear about retry counts.
* Change usage of `$@` to `"$@"` to pass args correctly
* Fix `CPACK_COMMAND_HDIUTIL` generation
* Switch `package.sh` to use `$GITHUB_WORKSPACE`
* Make `repeat_hdiutil.sh` executable
* Remove `set +x` and `set -x` options

Signed-off-by: Emily Mabrey <emabrey@tenacityaudio.org>
This commit is contained in:
Emily Mabrey 2021-07-23 16:25:13 -04:00 committed by GitHub
parent c927f17ce9
commit 63e882ff96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/ci/macos/repeat_hdiutil.sh
View File

@ -2,19 +2,21 @@
((${BASH_VERSION%%.*} >= 4)) || { echo >&2 "$0: Error: Please upgrade Bash."; exit 1; } ((${BASH_VERSION%%.*} >= 4)) || { echo >&2 "$0: Error: Please upgrade Bash."; exit 1; }
set -uxo pipefail set -uo pipefail
max_retry=5 max_retry=5
counter=0 counter=0
num_secs_await_retry=1 num_secs_await_retry=1
until /usr/bin/hdiutil ""$*"" -debug; do echo "Trying: " /usr/bin/hdiutil "$@"
until /usr/bin/hdiutil "$@"; do
sleep $num_secs_await_retry sleep $num_secs_await_retry
if [[ $counter -eq $max_retry ]]; then if [[ $counter -eq $max_retry ]]; then
echo "CPack failed despite retry attempts!" echo "CPack failed despite retry attempts!"
exit 1 exit 1
else else
echo "Trying CPack hdiutil call again. Try #$counter" echo "Trying CPack hdiutil call again. Retry attempt #$counter"
((counter++)) ((counter++))
fi fi
done done

6
scripts/ci/package.sh
View File

@ -9,8 +9,10 @@ cd build
if [[ "${OSTYPE}" == msys* && ${GIT_BRANCH} == release* ]]; then # Windows if [[ "${OSTYPE}" == msys* && ${GIT_BRANCH} == release* ]]; then # Windows
cmake --build . --target innosetup --config "${AUDACITY_BUILD_TYPE}" cmake --build . --target innosetup --config "${AUDACITY_BUILD_TYPE}"
else else
export CPACK_COMMAND_HDIUTIL="./macos/repeat_hdiutil.sh" # GITHUB_WORKSPACE is set by the checkout action in the action workflow configuration
cpack -C "${AUDACITY_BUILD_TYPE}" --verbose export CPACK_COMMAND_HDIUTIL="${GITHUB_WORKSPACE}/scripts/ci/macos/repeat_hdiutil.sh"
chmod +x $CPACK_COMMAND_HDIUTIL
cpack -C "${AUDACITY_BUILD_TYPE}" -D CPACK_COMMAND_HDIUTIL="${CPACK_COMMAND_HDIUTIL}" --verbose
fi fi
# Remove the temporary directory # Remove the temporary directory