feat(CI/Ubuntu): use acore.sh to install deps (#4042)
This commit is contained in:
@@ -51,9 +51,11 @@ jobs:
|
|||||||
ccache:${{ matrix.os }}:${{ matrix.compiler }}:${{ matrix.modules }}-modules:${{ github.ref }}
|
ccache:${{ matrix.os }}:${{ matrix.compiler }}:${{ matrix.modules }}-modules:${{ github.ref }}
|
||||||
ccache:${{ matrix.os }}:${{ matrix.compiler }}:${{ matrix.modules }}-modules
|
ccache:${{ matrix.os }}:${{ matrix.compiler }}:${{ matrix.modules }}-modules
|
||||||
- name: Configure OS
|
- name: Configure OS
|
||||||
run: source ./apps/ci/ci-install.sh
|
run: source ./acore.sh install-deps
|
||||||
env:
|
env:
|
||||||
CONTINUOUS_INTEGRATION: true
|
CONTINUOUS_INTEGRATION: true
|
||||||
|
- name: Create conf/config.sh
|
||||||
|
run: source ./apps/ci/ci-conf.sh
|
||||||
- name: Import db
|
- name: Import db
|
||||||
run: source ./apps/ci/ci-import-db.sh
|
run: source ./apps/ci/ci-import-db.sh
|
||||||
- name: Build
|
- name: Build
|
||||||
|
|||||||
Executable → Regular
-5
@@ -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';"
|
DB_WORLD_CONF="MYSQL_USER='root'; MYSQL_PASS='root'; MYSQL_HOST='localhost';"
|
||||||
CONFIG_SH
|
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
|
case $COMPILER in
|
||||||
|
|
||||||
# this is in order to use the "default" gcc version of the OS, without forcing a specific version
|
# this is in order to use the "default" gcc version of the OS, without forcing a specific version
|
||||||
@@ -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);
|
UBUNTU_VERSION=$(lsb_release -sr);
|
||||||
|
|
||||||
sudo apt-get update
|
sudo apt-get update -y
|
||||||
|
|
||||||
if [[ $CONTINUOUS_INTEGRATION ]]; then
|
if [[ $CONTINUOUS_INTEGRATION ]]; then
|
||||||
sudo apt-get -y install build-essential libtool make cmake cmake-data clang openssl libgoogle-perftools-dev \
|
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 \
|
libssl-dev libmysqlclient-dev libmysql++-dev libreadline6-dev zlib1g-dev libbz2-dev libace-dev mysql-client \
|
||||||
libncurses5-dev
|
libncurses5-dev ccache
|
||||||
else
|
else
|
||||||
case $UBUNTU_VERSION in
|
sudo apt-get install -y git cmake make gcc g++ clang libmysqlclient-dev \
|
||||||
"14.04")
|
libssl-dev libbz2-dev libreadline-dev libncurses-dev \
|
||||||
sudo apt-get -y install build-essential libtool make cmake cmake-data gcc g++ clang openssl libgoogle-perftools-dev \
|
mysql-server libace-6.* libace-dev curl unzip
|
||||||
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
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user