fixed build MacOS on CI

This commit is contained in:
Igor Korsukov 2020-10-12 10:26:15 +02:00
parent 29b279ff24
commit 36119443db
3 changed files with 2 additions and 10 deletions

View file

@ -68,7 +68,7 @@ jobs:
bash ./build/ci/macos/checkcodestyle.sh
- name: Setup environment
run: |
sudo bash ./build/ci/macos/setup.sh
bash ./build/ci/macos/setup.sh
- name: Build
run: |
T_ID=${{ secrets.TELEMETRY_TRACK_ID }}; if [ -z "$T_ID" ]; then T_ID="-"; fi

View file

@ -130,8 +130,7 @@ cmake_dir="cmake/${cmake_version}"
if [[ ! -d "${cmake_dir}" ]]; then
mkdir -p "${cmake_dir}"
cmake_url="https://cmake.org/files/v${cmake_version%.*}/cmake-${cmake_version}-Linux-x86_64.tar.gz"
wget -q --show-progress --no-check-certificate -O - "${cmake_url}" \
| tar --strip-components=1 -xz -C "${cmake_dir}"
wget -q --show-progress --no-check-certificate -O - "${cmake_url}" | tar --strip-components=1 -xz -C "${cmake_dir}"
fi
echo export PATH="${PWD%/}/${cmake_dir}/bin:\${PATH}" >> ${ENV_FILE}
export PATH="${PWD%/}/${cmake_dir}/bin:${PATH}"

View file

@ -16,13 +16,6 @@ brew update
# additional dependencies
brew install jack lame
# TODO Find out why
#hack to fix macOS build
# brew uninstall wget
# brew install wget
# brew uninstall --ignore-dependencies python2
# brew install python2
BREW_CELLAR=$(brew --cellar)
BREW_PREFIX=$(brew --prefix)