From 4e689bd8a33dc75b69ba41da02ff78b1b0059f2e Mon Sep 17 00:00:00 2001 From: Tommaso Pecorella Date: Mon, 25 Apr 2022 02:39:35 +0200 Subject: [PATCH] ci: remove python2 and fix ubuntu 22.04 --- utils/tests/gitlab-ci-gcc.yml | 2 +- utils/tests/gitlab-ci-ubuntu.yml | 52 +++++++++++++++++++++++--------- 2 files changed, 39 insertions(+), 15 deletions(-) diff --git a/utils/tests/gitlab-ci-gcc.yml b/utils/tests/gitlab-ci-gcc.yml index 5c2df5a3a..ee2d41263 100644 --- a/utils/tests/gitlab-ci-gcc.yml +++ b/utils/tests/gitlab-ci-gcc.yml @@ -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++ cmake ninja-build python python3 python-dev qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools openmpi-bin openmpi-common openmpi-doc libopenmpi-dev ccache flex bison libfl-dev sqlite3 libsqlite3-dev libxml2 libxml2-dev libgtk-3-dev libboost-all-dev gsl-bin libgsl0-dev ssh --yes + - apt-get --quiet install gcc g++ cmake ninja-build python3 python3-dev qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools openmpi-bin openmpi-common openmpi-doc libopenmpi-dev ccache flex bison libfl-dev sqlite3 libsqlite3-dev libxml2 libxml2-dev libgtk-3-dev libboost-all-dev gsl-bin libgsl0-dev ssh --yes variables: COMPILER: g++ ENABLE_MPI: --enable-mpi diff --git a/utils/tests/gitlab-ci-ubuntu.yml b/utils/tests/gitlab-ci-ubuntu.yml index b3cf9768a..611254be4 100644 --- a/utils/tests/gitlab-ci-ubuntu.yml +++ b/utils/tests/gitlab-ci-ubuntu.yml @@ -15,8 +15,9 @@ - $UBUNTU == "True" before_script: - apt-get --quiet update --yes + - apt-get --quiet upgrade --yes - DEBIAN_FRONTEND=noninteractive apt-get install -y tzdata - - apt-get --quiet install gcc g++ cmake ninja-build python python3 python-dev qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools openmpi-bin openmpi-common openmpi-doc libopenmpi-dev gsl-bin libgsl-dev ccache flex bison libfl-dev sqlite3 libsqlite3-dev libxml2 libxml2-dev libgtk-3-dev libboost-all-dev $LIBGSL ssh --yes + - apt-get --quiet install gcc g++ cmake ninja-build python3 python3-dev qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools openmpi-bin openmpi-common openmpi-doc libopenmpi-dev gsl-bin libgsl-dev ccache flex bison libfl-dev sqlite3 libsqlite3-dev libxml2 libxml2-dev libgtk-3-dev libboost-all-dev $LIBGSL ssh --yes variables: COMPILER: g++ @@ -26,11 +27,12 @@ weekly-build-ubuntu-18.04-debug: image: ubuntu:18.04 before_script: - apt-get --quiet update --yes + - apt-get --quiet upgrade --yes - apt-get --quiet install software-properties-common --yes - add-apt-repository ppa:ubuntu-toolchain-r/test --yes - apt-get --quiet update --yes - DEBIAN_FRONTEND=noninteractive apt-get install -y tzdata - - apt-get --quiet install gcc-9 g++-9 cmake ninja-build python python3 python-dev qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools openmpi-bin openmpi-common openmpi-doc libopenmpi-dev gsl-bin libgsl-dev ccache flex bison libfl-dev sqlite3 libsqlite3-dev libxml2 libxml2-dev libgtk-3-dev libboost-all-dev $LIBGSL ssh --yes + - apt-get --quiet install gcc-9 g++-9 cmake ninja-build python3 python3-dev qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools openmpi-bin openmpi-common openmpi-doc libopenmpi-dev gsl-bin libgsl-dev ccache flex bison libfl-dev sqlite3 libsqlite3-dev libxml2 libxml2-dev libgtk-3-dev libboost-all-dev $LIBGSL ssh --yes - update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 700 --slave /usr/bin/g++ g++ /usr/bin/g++-7 - update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 800 --slave /usr/bin/g++ g++ /usr/bin/g++-9 variables: @@ -46,7 +48,7 @@ weekly-build-ubuntu-18.04-release: - add-apt-repository ppa:ubuntu-toolchain-r/test --yes - apt-get --quiet update --yes - DEBIAN_FRONTEND=noninteractive apt-get install -y tzdata - - apt-get --quiet install gcc-9 g++-9 cmake ninja-build python python3 python-dev qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools openmpi-bin openmpi-common openmpi-doc libopenmpi-dev gsl-bin libgsl-dev ccache flex bison libfl-dev sqlite3 libsqlite3-dev libxml2 libxml2-dev libgtk-3-dev libboost-all-dev $LIBGSL ssh --yes + - apt-get --quiet install gcc-9 g++-9 cmake ninja-build python3 python3-dev qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools openmpi-bin openmpi-common openmpi-doc libopenmpi-dev gsl-bin libgsl-dev ccache flex bison libfl-dev sqlite3 libsqlite3-dev libxml2 libxml2-dev libgtk-3-dev libboost-all-dev $LIBGSL ssh --yes - update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 700 --slave /usr/bin/g++ g++ /usr/bin/g++-7 - update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 800 --slave /usr/bin/g++ g++ /usr/bin/g++-9 variables: @@ -62,7 +64,7 @@ weekly-build-ubuntu-18.04-optimized: - add-apt-repository ppa:ubuntu-toolchain-r/test --yes - apt-get --quiet update --yes - DEBIAN_FRONTEND=noninteractive apt-get install -y tzdata - - apt-get --quiet install gcc-9 g++-9 cmake ninja-build python python3 python-dev qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools openmpi-bin openmpi-common openmpi-doc libopenmpi-dev gsl-bin libgsl-dev ccache flex bison libfl-dev sqlite3 libsqlite3-dev libxml2 libxml2-dev libgtk-3-dev libboost-all-dev $LIBGSL ssh --yes + - apt-get --quiet install gcc-9 g++-9 cmake ninja-build python3 python3-dev qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools openmpi-bin openmpi-common openmpi-doc libopenmpi-dev gsl-bin libgsl-dev ccache flex bison libfl-dev sqlite3 libsqlite3-dev libxml2 libxml2-dev libgtk-3-dev libboost-all-dev $LIBGSL ssh --yes - update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 700 --slave /usr/bin/g++ g++ /usr/bin/g++-7 - update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 800 --slave /usr/bin/g++ g++ /usr/bin/g++-9 variables: @@ -113,24 +115,46 @@ weekly-build-ubuntu-18.04-optimized: # MODE: optimized # LIBGSL: libgsl25 -# Ubuntu Rolling -weekly-build-ubuntu-rolling-debug: +# Ubuntu 22.04 (Until January 2032) +weekly-build-ubuntu-22.04-debug: extends: .weekly-build-ubuntu - image: ubuntu:rolling + image: ubuntu:22.04 variables: MODE: debug - LIBGSL: libgsl25 + LIBGSL: libgsl27 -weekly-build-ubuntu-rolling-release: +weekly-build-ubuntu-22.04-release: extends: .weekly-build-ubuntu - image: ubuntu:rolling + image: ubuntu:22.04 variables: MODE: release - LIBGSL: libgsl25 + LIBGSL: libgsl27 -weekly-build-ubuntu-rolling-optimized: +weekly-build-ubuntu-22.04-optimized: extends: .weekly-build-ubuntu - image: ubuntu:rolling + image: ubuntu:22.04 variables: MODE: optimized - LIBGSL: libgsl25 + LIBGSL: libgsl27 + +# Ubuntu Rolling +# weekly-build-ubuntu-rolling-debug: +# extends: .weekly-build-ubuntu +# image: ubuntu:rolling +# variables: +# MODE: debug +# LIBGSL: libgsl27 + +# weekly-build-ubuntu-rolling-release: +# extends: .weekly-build-ubuntu +# image: ubuntu:rolling +# variables: +# MODE: release +# LIBGSL: libgsl27 + +# weekly-build-ubuntu-rolling-optimized: +# extends: .weekly-build-ubuntu +# image: ubuntu:rolling +# variables: +# MODE: optimized +# LIBGSL: libgsl27