1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-10 00:23:32 +02:00

Fix MacOS hdiutil CMake parallelization issue

* Make CMake builds better parallelized
* Update CI Build script parallelization
* Make `repeat_hdiutil.sh` take longer between repeats
* Make sure that bash is the latest version on CI builds.

Signed-off-by: Emily Mabrey <emabrey@tenacityaudio.org>
Reference-to: https://github.com/tenacityteam/tenacity/pull/391
This commit is contained in:
Emily Mabrey
2021-07-26 23:55:44 -04:00
committed by GitHub
parent d8e17c5e67
commit e06af5bb29
10 changed files with 58 additions and 18 deletions

View File

@@ -18,8 +18,12 @@ else # Linux & others
fi
export CMAKE_BUILD_PARALLEL_LEVEL=$(( ${cpus} > 2 ? $((${cpus} - 2)) : ${cpus} ))
echo "Using ${CMAKE_BUILD_PARALLEL_LEVEL} processors for cmake build"
# Build Audacity
cmake --build build -j "${cpus}" --config "${AUDACITY_BUILD_TYPE}"
cmake --build build --config "${AUDACITY_BUILD_TYPE}"
BIN_OUTPUT_DIR=build/bin/${AUDACITY_BUILD_TYPE}
SYMBOLS_OUTPUT_DIR=debug
@@ -29,7 +33,7 @@ mkdir ${SYMBOLS_OUTPUT_DIR}
if [[ "${OSTYPE}" == msys* ]]; then # Windows
# copy PDBs to debug folder...
find ${BIN_OUTPUT_DIR} -name '*.pdb' | xargs -I % cp % ${SYMBOLS_OUTPUT_DIR}
# and remove debug symbol files from the file tree before archieving
# and remove debug symbol files from the file tree before archiving
find ${BIN_OUTPUT_DIR} -name '*.iobj' -o -name '*.ipdb' -o -name '*.pdb' -o -name '*.ilk' | xargs rm -f
elif [[ "${OSTYPE}" == darwin* ]]; then # macOS
find ${BIN_OUTPUT_DIR} -name '*.dSYM' | xargs -J % mv % ${SYMBOLS_OUTPUT_DIR}

View File

@@ -10,7 +10,7 @@ if [[ "${OSTYPE}" == msys* ]]; then # Windows
# Chocolatey packages
choco_packages=(
sccache
sccache
conan
)
@@ -44,6 +44,7 @@ else # Linux & others
g++
git
wget
bash
# GitHub Actions
libasound2-dev
@@ -53,7 +54,7 @@ else # Linux & others
)
sudo apt-get update -y
sudo apt-get install -y --no-install-recommends "${apt_packages[@]}"
# Download Conan from github
wget "https://github.com/conan-io/conan/releases/latest/download/conan-ubuntu-64.deb" -nv -O /tmp/conan.deb
sudo dpkg -i /tmp/conan.deb

View File

@@ -6,7 +6,7 @@ set -uo pipefail
max_retry=5
counter=0
num_secs_await_retry=1
num_secs_await_retry=5
echo "Trying: " /usr/bin/hdiutil "$@"