Commit a0a01e6b authored by Steffen Müthing's avatar Steffen Müthing

[!28] Replace clang 6 with clang 7 for libc++-based images

Merge branch 'bugfix/debian-libc++' into 'master'

ref:docker/ci Debian bumped the version of libc++ to the one from clang 7 in
testing, so we have to follow suit to make the infrastructure work again.

See merge request [!28]

  [!28]: gitlab.dune-project.org/docker/ci/merge_requests/28
parents 9482f0d1 b411ac48
......@@ -197,13 +197,13 @@ dune:git-debian-10-gcc-7-14:
TOOLCHAIN: "gcc-7-14"
EXTRA_TAG: git
dune:git-debian-10-clang-6-libcpp-17:
dune:git-debian-10-clang-7-libcpp-17:
<<: *core-image
variables:
<<: *core-variables
VERSION: "git"
BASE_IMAGE: "debian:10"
TOOLCHAIN: "clang-6-libcpp-17"
TOOLCHAIN: "clang-7-libcpp-17"
dune:git-ubuntu-18.04-clang-6-17:
<<: *core-image
......@@ -264,13 +264,13 @@ dune:2.6-debian-10-gcc-8-17:
BASE_IMAGE: "debian:10"
TOOLCHAIN: "gcc-8-17"
dune:2.6-debian-10-clang-6-libcpp-17:
dune:2.6-debian-10-clang-7-libcpp-17:
<<: *core-image
variables:
<<: *core-variables
VERSION: "2.6"
BASE_IMAGE: "debian:10"
TOOLCHAIN: "clang-6-libcpp-17"
TOOLCHAIN: "clang-7-libcpp-17"
dune:2.6-ubuntu-18.04-clang-6-17:
<<: *core-image
......@@ -313,13 +313,13 @@ dune-pdelab-deps:2.6-debian-10-gcc-8-17:
BASE_IMAGE: "dune:2.6-debian-10-gcc-8-17"
EXTRA_TAG: "2.6"
dune-pdelab-deps:2.6-debian-10-clang-6-libcpp-17:
dune-pdelab-deps:2.6-debian-10-clang-7-libcpp-17:
<<: *module-deps-image
variables:
<<: *module-deps-variables
MODULE: pdelab
VERSION: "2.6"
BASE_IMAGE: "dune:2.6-debian-10-clang-6-libcpp-17"
BASE_IMAGE: "dune:2.6-debian-10-clang-7-libcpp-17"
dune-pdelab-deps:git-debian-10-gcc-7-14:
<<: *module-deps-image
......@@ -338,13 +338,13 @@ dune-pdelab-deps:git-debian-10-gcc-8-noassert-17:
VERSION: git
BASE_IMAGE: "dune:git-debian-10-gcc-8-noassert-17"
dune-pdelab-deps:git-debian-10-clang-6-libcpp-17:
dune-pdelab-deps:git-debian-10-clang-7-libcpp-17:
<<: *module-deps-image
variables:
<<: *module-deps-variables
MODULE: pdelab
VERSION: "git"
BASE_IMAGE: "dune:git-debian-10-clang-6-libcpp-17"
BASE_IMAGE: "dune:git-debian-10-clang-7-libcpp-17"
# ---------------------------------------------------------------------
......@@ -394,7 +394,7 @@ dune-pdelab:2.6-debian-10-gcc-8-17:
BASE_IMAGE: "dune-pdelab-deps:2.6-debian-10-gcc-8-17"
EXTRA_TAG: "2.6"
dune-pdelab:2.6-debian-10-clang-6-libcpp-17:
dune-pdelab:2.6-debian-10-clang-7-libcpp-17:
<<: *module-image
variables:
<<: *module-variables
......@@ -419,7 +419,7 @@ dune-pdelab:git-debian-10-gcc-8-noassert-17:
VERSION: git
BASE_IMAGE: "dune-pdelab-deps:git-debian-10-gcc-8-noassert-17"
dune-pdelab:git-debian-10-clang-6-libcpp-17:
dune-pdelab:git-debian-10-clang-7-libcpp-17:
<<: *module-image
variables:
<<: *module-variables
......
......@@ -21,7 +21,7 @@ given by strings of the following format: `<compiler>-<version>-<optional extras
| image | parent | mirror | description | toolchains |
|----------------------------|--------------|---------------------|------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------|
| rdo/docker/ci/debian:9 | debian:9 | duneci/debian:9 | Debian 9 with cmake 3.7 | gcc-6-14, gcc-6-noassert-14, clang-3.8-14, clang-3.8-noassert-14 |
| rdo/docker/ci/debian:10 | debian:10 | duneci/debian:10 | Debian 10 with cmake 3.11 | gcc-7-14, gcc-7-noassert-14, gcc-7-17, gcc-8-17, gcc-8-noassert-17, clang-6-17, clang-6-noassert-17m clang-6-libcpp-17, clang-6-libcpp-noassert-17 |
| rdo/docker/ci/debian:10 | debian:10 | duneci/debian:10 | Debian 10 with cmake 3.11 | gcc-7-14, gcc-7-noassert-14, gcc-7-17, gcc-8-17, gcc-8-noassert-17, clang-6-17, clang-6-noassert-17 clang-7-libcpp-17, clang-7-libcpp-noassert-17 |
| rdo/docker/ci/ubuntu:16.04 | ubuntu:16.04 | duneci/ubuntu:16.04 | Ubuntu LTS 16.04 with cmake 3.5.1 | gcc-5-14, gcc-5-noassert-14, clang-3.8-14 |
| rdo/docker/ci/ubuntu:18.04 | ubuntu:18.04 | duneci/ubuntu:18.04 | Ubuntu LTS 18.04 with cmake 3.10.2 | gcc-7-14, gcc-7-noassert-14, gcc-7-17, gcc-7-noassert-17, clang-6-17, clang-6-noassert-17 |
......@@ -46,7 +46,7 @@ in for these images.
| rdo/docker/ci/dune:git-debian-10-gcc-7-14 | duneci/dune:git-debian-10-gcc-7-14 | DUNE master core and staging modules (Git) |
| rdo/docker/ci/dune:git-debian-10-gcc-8-17 | duneci/dune:git-debian-10-gcc-8-17 | DUNE master core and staging modules (Git) |
| rdo/docker/ci/dune:git-debian-10-gcc-8-noassert-17 | duneci/dune:git-debian-10-gcc-8-noassert-17 | DUNE master core and staging modules (Git) |
| rdo/docker/ci/dune:git-debian-10-clang-6-libcpp-17 | duneci/dune:git-debian-10-clang-6-libcpp-17 | DUNE master core and staging modules (Git) |
| rdo/docker/ci/dune:git-debian-10-clang-6-libcpp-17 | duneci/dune:git-debian-10-clang-7-libcpp-17 | DUNE master core and staging modules (Git) |
| rdo/docker/ci/dune:git-ubuntu-18.04-clang-6-17 | duneci/dune:git-ubuntu-18.04-clang-6-17 | DUNE master core and staging modules (Git) |
......@@ -69,7 +69,7 @@ These images contain all dependencies for testing the respective downstream modu
| rdo/docker/ci/dune-pdelab-deps:2.6-debian-9-gcc-6-14 | rdo/docker/ci/dune:2.6-debian-9-gcc-6-14 | dune-alugrid (2.6 branch) |
| rdo/docker/ci/dune-pdelab-deps:2.6-debian-10-gcc-7-noassert-14 | rdo/docker/ci/dune:2.6-debian-10-gcc-7-noassert-14 | dune-alugrid (2.6 branch) |
| rdo/docker/ci/dune-pdelab-deps:2.6-debian-10-gcc-8-17 | rdo/docker/ci/dune:2.6-debian-10-gcc-8-17 | dune-alugrid (2.6 branch) |
| rdo/docker/ci/dune-pdelab-deps:2.6-debian-10-clang-6-libcpp-17 | rdo/docker/ci/dune:2.6-debian-10-clang-6-libcpp-17 | dune-alugrid (2.6 branch) |
| rdo/docker/ci/dune-pdelab-deps:2.6-debian-10-clang-6-libcpp-17 | rdo/docker/ci/dune:2.6-debian-10-clang-7-libcpp-17 | dune-alugrid (2.6 branch) |
| rdo/docker/ci/dune-pdelab-deps:git-debian-10-gcc-7-14 | rdo/docker/ci/dune:git-debian-10-gcc-7-14 | dune-alugrid (master branch) |
| rdo/docker/ci/dune-pdelab-deps:git-debian-10-gcc-8-noassert-17 | rdo/docker/ci/dune:git-debian-10-gcc-8-noassert-17 | dune-alugrid (master branch) |
| rdo/docker/ci/dune-pdelab-deps:git-debian-10-clang-6-libcpp-17 | rdo/docker/ci/dune:git-debian-10-clang-6-libcpp-17 | dune-alugrid (master branch) |
......@@ -86,10 +86,10 @@ These images are for testing downstream modules.
| rdo/docker/ci/dune-pdelab:2.6-debian-9-gcc-6-14 | rdo/docker/ci/dune-pdelab-deps:2.6-debian-9-gcc-6-14 | dune-{pdelab,testtools} (2.6 branch), enabled Python virtualenv |
| rdo/docker/ci/dune-pdelab:2.6-debian-10-gcc-7-noassert-14 | rdo/docker/ci/dune-pdelab-deps:2.6-debian-10-gcc-7-noassert-14 | dune-{pdelab,testtools} (2.6 branch), enabled Python virtualenv |
| rdo/docker/ci/dune-pdelab:2.6-debian-10-gcc-8-17 | rdo/docker/ci/dune-pdelab-deps:2.6-debian-10-gcc-8-17 | dune-{pdelab,testtools} (2.6 branch), enabled Python virtualenv |
| rdo/docker/ci/dune-pdelab:2.6-debian-10-clang-6-libcpp-17 | rdo/docker/ci/dune-pdelab-deps:2.6-debian-10-clang-6-libcpp-17 | dune-{pdelab,testtools} (2.6 branch), enabled Python virtualenv |
| rdo/docker/ci/dune-pdelab:2.6-debian-10-clang-6-libcpp-17 | rdo/docker/ci/dune-pdelab-deps:2.6-debian-10-clang-7-libcpp-17 | dune-{pdelab,testtools} (2.6 branch), enabled Python virtualenv |
| rdo/docker/ci/dune-pdelab:git-debian-10-gcc-7-14 | rdo/docker/ci/dune-pdelab-deps:git-debian-10-gcc-7-14 | dune-{pdelab,testtools} (master branch), enabled Python virtualenv |
| rdo/docker/ci/dune-pdelab:git-debian-10-gcc-8-noassert-17 | rdo/docker/ci/dune-pdelab-deps:git-debian-10-gcc-8-noassert-17 | dune-{pdelab,testtools} (master branch), enabled Python virtualenv |
| rdo/docker/ci/dune-pdelab:git-debian-10-clang-6-libcpp-17 | rdo/docker/ci/dune-pdelab-deps:git-debian-10-clang-6-libcpp-17 | dune-{pdelab,testtools} (master branch), enabled Python virtualenv |
| rdo/docker/ci/dune-pdelab:git-debian-10-clang-6-libcpp-17 | rdo/docker/ci/dune-pdelab-deps:git-debian-10-clang-7-libcpp-17 | dune-{pdelab,testtools} (master branch), enabled Python virtualenv |
`.gitlab-ci.yml`
......
......@@ -14,8 +14,9 @@ RUN export DEBIAN_FRONTEND=noninteractive; \
gfortran-7 \
ca-certificates \
clang-6.0 \
libc++-dev \
libc++abi-dev \
clang-7 \
libc++-7-dev \
libc++abi-7-dev \
cmake \
coinor-libipopt-dev \
curl \
......
CC=clang-6.0
CXX=clang++-6.0
CC=clang-7
CXX=clang++-7
FC=gfortran-8
CFLAGS="-Wall -fdiagnostics-color=always"
......
CC=clang-6.0
CXX=clang++-6.0
CC=clang-7
CXX=clang++-7
FC=gfortran-8
CFLAGS="-Wall -fdiagnostics-color=always"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment