feat(CI/MacOS): use acore.sh to install deps (#4003)

This commit is contained in:
Patrick Lewis
2020-12-22 09:55:58 -08:00
committed by GitHub
parent 46d6a4690b
commit 0067d45ba4
5 changed files with 24 additions and 15 deletions

View File

@@ -85,8 +85,10 @@ jobs:
restore-keys: |
ccache:${{ matrix.os }}:${{ github.ref }}
ccache:${{ matrix.os }}
- name: Install latest bash
run: brew install bash
- name: Configure OS
run: source ./apps/ci/mac/ci-install.sh
run: source ./acore.sh install-deps
- name: Build
run: source ./apps/ci/mac/ci-compile.sh
- name: Run unit tests

View File

@@ -1,5 +1,14 @@
unamestr=$(uname)
if [[ "$unamestr" == 'Darwin' ]]; then
if ! command -v brew &>/dev/null ; then
ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
fi
if ! [ "${BASH_VERSINFO}" -ge 4 ]; then
brew install bash
fi
if ! command -v greadlink &>/dev/null ; then
brew install coreutils
fi
AC_PATH_ROOT=$(greadlink -f "$AC_PATH_APPS/../")
else
AC_PATH_ROOT=$(readlink -f "$AC_PATH_APPS/../")
@@ -10,4 +19,3 @@ AC_PATH_CONF="$AC_PATH_ROOT/conf"
AC_PATH_MODULES="$AC_PATH_ROOT/modules"
AC_PATH_DEPS="$AC_PATH_ROOT/deps"

View File

@@ -5,7 +5,7 @@ export CCACHE_MAXSIZE='2G'
export CCACHE_COMPRESS=9
ccache -s
mkdir var/build/obj && cd var/build/obj;
cd var/build/obj
time cmake ../../../ \
-DTOOLS=1 \

View File

@@ -1,10 +0,0 @@
#!/usr/bin/env bash
##########################################
## workaround to fix macos-10.15 configure os from failing
time brew reinstall openssl@1.1
##########################################
time brew update
time brew install openssl readline ace coreutils bash bash-completion mysql ccache

View File

@@ -1,6 +1,15 @@
ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
##########################################
## workaround to fix macos-10.15 configure os from failing
brew reinstall openssl@1.1
##########################################
brew update
brew install openssl readline cmake ace coreutils bash bash-completion md5sha1sum curl unzip
##########################################
## workaround for cmake already being installed in the github runners
if ! command -v cmake &>/dev/null ; then
brew install cmake
fi
##########################################
brew install openssl readline ace bash-completion curl unzip mysql ccache