feat(CI/Ubuntu): use acore.sh to install deps (#4042)

This commit is contained in:
Patrick Lewis 2021-01-09 03:12:38 -08:00 committed by GitHub
parent dd8abcd87e
commit 96a549c559
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 20 deletions

View file

@ -51,9 +51,11 @@ jobs:
ccache:${{ matrix.os }}:${{ matrix.compiler }}:${{ matrix.modules }}-modules:${{ github.ref }}
ccache:${{ matrix.os }}:${{ matrix.compiler }}:${{ matrix.modules }}-modules
- name: Configure OS
run: source ./apps/ci/ci-install.sh
run: source ./acore.sh install-deps
env:
CONTINUOUS_INTEGRATION: true
- name: Create conf/config.sh
run: source ./apps/ci/ci-conf.sh
- name: Import db
run: source ./apps/ci/ci-import-db.sh
- name: Build

5
apps/ci/ci-install.sh → apps/ci/ci-conf.sh Executable file → Normal file
View file

@ -19,11 +19,6 @@ DB_AUTH_CONF="MYSQL_USER='root'; MYSQL_PASS='root'; MYSQL_HOST='localhost';"
DB_WORLD_CONF="MYSQL_USER='root'; MYSQL_PASS='root'; MYSQL_HOST='localhost';"
CONFIG_SH
time sudo apt-get update -y
# time sudo apt-get upgrade -y
time sudo apt-get install -y git lsb-release sudo ccache
time ./acore.sh install-deps
case $COMPILER in
# this is in order to use the "default" gcc version of the OS, without forcing a specific version

View file

@ -1,24 +1,19 @@
if ! command -v lsb_release &>/dev/null ; then
sudo apt-get install -y lsb-release
fi
UBUNTU_VERSION=$(lsb_release -sr);
sudo apt-get update
sudo apt-get update -y
if [[ $CONTINUOUS_INTEGRATION ]]; then
sudo apt-get -y install build-essential libtool make cmake cmake-data clang openssl libgoogle-perftools-dev \
libssl-dev libmysqlclient-dev libmysql++-dev libreadline6-dev zlib1g-dev libbz2-dev libace-dev mysql-client \
libncurses5-dev
libncurses5-dev ccache
else
case $UBUNTU_VERSION in
"14.04")
sudo apt-get -y install build-essential libtool make cmake cmake-data gcc g++ clang openssl libgoogle-perftools-dev \
libssl-dev libmysqlclient-dev libmysql++-dev libreadline6-dev zlib1g-dev libbz2-dev libace-dev mysql-server libncurses-dev \
curl unzip
;;
*)
sudo apt-get install -y git cmake make gcc g++ clang libmysqlclient-dev \
libssl-dev libbz2-dev libreadline-dev libncurses-dev \
mysql-server libace-6.* libace-dev curl unzip
;;
esac
sudo apt-get install -y git cmake make gcc g++ clang libmysqlclient-dev \
libssl-dev libbz2-dev libreadline-dev libncurses-dev \
mysql-server libace-6.* libace-dev curl unzip
fi