Merge pull request #4852 from williamfgc/ci-containers-update

Bump CI containers to Ubuntu 22
QMCPACK · Dec 2, 2023 · 0670f16 · 0670f16
2 parents 09203fe + c1af320
commit 0670f16
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 170 deletions.
diff --git a/.github/workflows/ci-github-actions.yaml b/.github/workflows/ci-github-actions.yaml
@@ -68,24 +68,24 @@ jobs:
               image: ghcr.io/qmcpack/ubuntu22-openmpi:latest
               options: -u 1001
 
-          - jobname: GCC11-NoMPI-Werror-Real
+          - jobname: GCC12-NoMPI-Werror-Real
             container:
-              image: ghcr.io/qmcpack/ubuntu2110-serial:latest
+              image: ghcr.io/qmcpack/ubuntu22-serial:latest
               options: -u 1001
 
-          - jobname: GCC11-NoMPI-Werror-Complex
+          - jobname: GCC12-NoMPI-Werror-Complex
             container:
-              image: ghcr.io/qmcpack/ubuntu2110-serial:latest
+              image: ghcr.io/qmcpack/ubuntu22-serial:latest
               options: -u 1001
 
-          - jobname: GCC11-NoMPI-Werror-Real-Mixed
+          - jobname: GCC12-NoMPI-Werror-Real-Mixed
             container:
-              image: ghcr.io/qmcpack/ubuntu2110-serial:latest
+              image: ghcr.io/qmcpack/ubuntu22-serial:latest
               options: -u 1001
 
-          - jobname: GCC11-NoMPI-Werror-Complex-Mixed
+          - jobname: GCC12-NoMPI-Werror-Complex-Mixed
             container:
-              image: ghcr.io/qmcpack/ubuntu2110-serial:latest
+              image: ghcr.io/qmcpack/ubuntu22-serial:latest
               options: -u 1001
 
           - jobname: Clang14-NoMPI-ASan-Real

diff --git a/config/docker/dependencies/ubuntu/clang-latest/Dockerfile b/config/docker/dependencies/ubuntu/clang-latest/Dockerfile
diff --git a/config/docker/dependencies/ubuntu/impish/Dockerfile b/config/docker/dependencies/ubuntu/impish/Dockerfile
diff --git a/config/docker/dependencies/ubuntu22/Dockerfile b/config/docker/dependencies/ubuntu22/Dockerfile
diff --git a/...er/dependencies/ubuntu/openmpi/Dockerfile → ...r/dependencies/ubuntu22/serial/Dockerfile b/...er/dependencies/ubuntu/openmpi/Dockerfile → ...r/dependencies/ubuntu22/serial/Dockerfile
@@ -1,5 +1,4 @@
-FROM ubuntu:20.04
-LABEL maintainer="williamfgc@yahoo.com"
+FROM ubuntu:22.04
 
 RUN export DEBIAN_FRONTEND=noninteractive &&\
     apt-get clean &&\
@@ -12,18 +11,17 @@ RUN wget https://apt.kitware.com/kitware-archive.sh &&\
     sh kitware-archive.sh
 
 RUN export DEBIAN_FRONTEND=noninteractive &&\
-    apt-get install gcc g++ \ 
-    clang \
-    clang-format \
-    clang-tidy \
+    apt-get install gcc-12 g++-12 \ 
+    clang-14 \
+    clang-format-14 \
+    clang-tidy-14 \
+    libomp-14-dev \
     gcovr \
     python3 \
     cmake \
     ninja-build \
     libboost-all-dev \
     git \
-    libopenmpi-dev \
-    libhdf5-openmpi-dev \
     libhdf5-serial-dev \
     hdf5-tools \
     libfftw3-dev \
@@ -49,8 +47,20 @@ RUN export DEBIAN_FRONTEND=noninteractive &&\
 RUN export DEBIAN_FRONTEND=noninteractive &&\
     pip3 install cif2cell
 
+# add gcc-12 as gcc
+RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 100 && \
+    update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-12 100
+
+# add clang-14 as clang
+RUN update-alternatives --install /usr/bin/clang clang /usr/bin/clang-14 100 && \
+    update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-14 100
+
+# add clang-format and clang-tidy as well as libomp
+RUN update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-14 100 && \
+    update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-14 100 && \
+    update-alternatives --install /usr/bin/clang-tidy-diff.py clang-tidy-diff.py /usr/bin/clang-tidy-diff-14.py 100
+
 # must add a user different from root 
-# to run MPI executables
 RUN useradd -ms /bin/bash user
 # allow in sudoers to install packages
 RUN adduser user sudo

diff --git a/tests/test_automation/github-actions/ci/run_step.sh b/tests/test_automation/github-actions/ci/run_step.sh
@@ -155,7 +155,7 @@ case "$1" in
               -DCMAKE_BUILD_TYPE=RelWithDebInfo \
               ${GITHUB_WORKSPACE}
       ;;
-      *"GCC11-NoMPI-Werror-"*)
+      *"GCC12-NoMPI-Werror-"*)
         echo 'Configure for building with gcc -Werror flag enabled'
         cmake -GNinja \
               -DCMAKE_C_COMPILER=gcc \