F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjust GitLab.com CI configuration for build version feature

Browse Source 
* Add a git tag to the tip of the branch before building
* Install git package before building
* Update ubuntu and fedora builds to install git package
This commit is contained in:
Mathew Bielejeski
2020-08-13 07:33:51 -07:00
committed by Tom Henderson
parent 151553226e
commit 941a67fca7
6 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
utils/tests/gitlab-ci-clang.yml
View File

@@ -16,7 +16,7 @@
- $CLANG_BUILD_ENABLE == "True"
before_script:
- apt-get --quiet update --yes
- apt-get --quiet install gcc g++ python python-dev qt5-default openmpi-bin openmpi-common openmpi-doc libopenmpi-dev gsl-bin libgsl-dev ccache flex bison libfl-dev sqlite sqlite3 libsqlite3-dev libxml2 libxml2-dev libgtk2.0-0 libgtk2.0-dev libboost-all-dev libgsl23 --yes
- apt-get --quiet install gcc g++ python python-dev qt5-default openmpi-bin openmpi-common openmpi-doc libopenmpi-dev gsl-bin libgsl-dev ccache flex bison libfl-dev sqlite sqlite3 libsqlite3-dev libxml2 libxml2-dev libgtk2.0-0 libgtk2.0-dev libboost-all-dev libgsl23 git --yes
- apt-get --quiet install software-properties-common gnupg wget --yes
- echo -en "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-$CLANG main \n deb-src http://apt.llvm.org/bionic/ llvm-toolchain-bionic-$CLANG main" > /etc/apt/sources.list.d/llvm.list
- wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -

2
utils/tests/gitlab-ci-fedora.yml
View File

@@ -14,7 +14,7 @@
- $RELEASE == "weekly"
- $FEDORA == "True"
before_script:
- dnf install gcc gcc-c++ python python-devel ccache gsl gsl-devel libgcrypt gtk3 gtk3-devel sqlite sqlite-devel libxml2 libxml2-devel openmpi openmpi-devel boost-devel pygobject3-devel python3-gobject gobject-introspection-devel goocanvas2-devel graphviz-devel graphviz ipython --assumeyes
- dnf install gcc gcc-c++ python python-devel ccache gsl gsl-devel libgcrypt gtk3 gtk3-devel sqlite sqlite-devel libxml2 libxml2-devel openmpi openmpi-devel boost-devel pygobject3-devel python3-gobject gobject-introspection-devel goocanvas2-devel graphviz-devel graphviz ipython git --assumeyes
variables:
COMPILER: g++

2
utils/tests/gitlab-ci-gcc.yml
View File

@@ -16,7 +16,7 @@
before_script:
- apt-get --quiet update --yes
- update-alternatives --install /usr/bin/gfortran gfortran /usr/local/bin/gfortran 999
- apt-get --quiet install gcc g++ python python3 python-dev qt5-default openmpi-bin openmpi-common openmpi-doc libopenmpi-dev ccache flex bison libfl-dev sqlite sqlite3 libsqlite3-dev libxml2 libxml2-dev libgtk-3-dev libboost-all-dev gsl-bin libgsl0-dev --yes
- apt-get --quiet install gcc g++ python python3 python-dev qt5-default openmpi-bin openmpi-common openmpi-doc libopenmpi-dev ccache flex bison libfl-dev sqlite sqlite3 libsqlite3-dev libxml2 libxml2-dev libgtk-3-dev libboost-all-dev gsl-bin libgsl0-dev git --yes
variables:
COMPILER: g++

8
utils/tests/gitlab-ci-test.yml
View File

@@ -8,6 +8,8 @@
.base-test:
stage: test
script:
# Add a git tag so that build version works with the CI fetching shallow clones
- git tag ns-3-dev-ci-test
- mkdir -p $CCACHE_BASEDIR_VALUE
- export CCACHE_BASEDIR=${PWD}
- export CCACHE_DIR=${PWD}/$CCACHE_BASEDIR_VALUE
@@ -61,7 +63,7 @@ daily-test-optimized:
- $RELEASE == "daily"
before_script:
- pacman -Syu --noconfirm
- pacman -Sy base-devel python ccache gsl libgcrypt gtk3 boost valgrind --noconfirm
- pacman -Sy base-devel python ccache gsl libgcrypt gtk3 boost valgrind git --noconfirm
### Valgrind tests
# Run the test.py script with files compiled in debug mode
@@ -111,7 +113,7 @@ weekly-test-optimized:
- $RELEASE == "weekly"
before_script:
- pacman -Syu --noconfirm
- pacman -Sy base-devel python ccache gsl libgcrypt gtk3 boost valgrind --noconfirm
- pacman -Sy base-devel python ccache gsl libgcrypt gtk3 boost valgrind git --noconfirm
# Do a check for the TAKES_FOREVER jobs, only in optimized mode
weekly-test-takes-forever-optimized:
@@ -126,4 +128,4 @@ weekly-test-takes-forever-optimized:
- $RELEASE == "weekly"
before_script:
- pacman -Syu --noconfirm
- pacman -Sy base-devel python ccache gsl libgcrypt gtk3 boost valgrind --noconfirm
- pacman -Sy base-devel python ccache gsl libgcrypt gtk3 boost valgrind git --noconfirm

2
utils/tests/gitlab-ci-ubuntu.yml
View File

@@ -16,7 +16,7 @@
before_script:
- apt-get --quiet update --yes
- DEBIAN_FRONTEND=noninteractive apt-get install -y tzdata
- apt-get --quiet install gcc g++ python python3 python-dev qt5-default openmpi-bin openmpi-common openmpi-doc libopenmpi-dev gsl-bin libgsl-dev ccache flex bison libfl-dev sqlite sqlite3 libsqlite3-dev libxml2 libxml2-dev libgtk-3-dev libboost-all-dev $LIBGSL --yes
- apt-get --quiet install gcc g++ python python3 python-dev qt5-default openmpi-bin openmpi-common openmpi-doc libopenmpi-dev gsl-bin libgsl-dev ccache flex bison libfl-dev sqlite sqlite3 libsqlite3-dev libxml2 libxml2-dev libgtk-3-dev libboost-all-dev $LIBGSL git --yes
variables:
COMPILER: g++

8
utils/tests/gitlab-ci.yml
View File

@@ -34,6 +34,8 @@ stages:
.base-build:
stage: build
script:
# Add a git tag so that build version works with the CI fetching shallow clones
- git tag ns-3-dev-ci
- mkdir -p $CCACHE_BASEDIR_VALUE
- export CCACHE_BASEDIR=${PWD}
- export CCACHE_DIR=${PWD}/$CCACHE_BASEDIR_VALUE
@@ -55,7 +57,7 @@ per-commit-compile-debug:
MODE: debug
before_script:
- pacman -Syu --noconfirm
- pacman -Sy base-devel python ccache gsl libgcrypt gtk3 boost --noconfirm
- pacman -Sy base-devel python ccache gsl libgcrypt gtk3 boost git --noconfirm
per-commit-compile-release:
extends: .base-build
@@ -65,7 +67,7 @@ per-commit-compile-release:
MODE: release
before_script:
- pacman -Syu --noconfirm
- pacman -Sy base-devel python ccache gsl libgcrypt gtk3 boost --noconfirm
- pacman -Sy base-devel python ccache gsl libgcrypt gtk3 boost git --noconfirm
per-commit-compile-optimized:
extends: .base-build
@@ -75,7 +77,7 @@ per-commit-compile-optimized:
MODE: optimized
before_script:
- pacman -Syu --noconfirm
- pacman -Sy base-devel python ccache gsl libgcrypt gtk3 boost --noconfirm
- pacman -Sy base-devel python ccache gsl libgcrypt gtk3 boost git --noconfirm
# Weekly jobs for other distribution and compilers
include: