From e659af8f1a50bed715ee5a56fab92cc62c57871d Mon Sep 17 00:00:00 2001 From: Mario Konrad Date: Fri, 7 May 2021 21:36:42 +0200 Subject: [PATCH] Build: docker for gcc-11.1.0 --- .gitlab-ci.yml | 4 ++-- .travis.yml | 3 ++- README.md | 1 + bin/docker-build.sh | 1 + bin/docker-prepare-image.sh | 1 + doc/devenv.dox | 1 + 6 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 21428d71..f7aec8b9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,9 +6,9 @@ - cmake --build build --target test - bin/test-library.sh -build:gcc-10.3.0: +build:gcc-11.1.0: variables: - COMPILER: gcc-10.3.0 + COMPILER: gcc-11.1.0 BUILD_TYPE: Release image: mariokonrad/marnav:${COMPILER} <<: *build_definition diff --git a/.travis.yml b/.travis.yml index 0241bbf9..84040e9b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,13 +18,14 @@ matrix: - env: COMPILER=gcc-8.3.0 BUILD_TYPE=Release - env: COMPILER=gcc-9.3.0 BUILD_TYPE=Release - env: COMPILER=gcc-10.3.0 BUILD_TYPE=Release + - env: COMPILER=gcc-11.1.0 BUILD_TYPE=Release - env: COMPILER=clang-5.0.2 BUILD_TYPE=Release - env: COMPILER=clang-6.0.0 BUILD_TYPE=Release - env: COMPILER=clang-7.1.0 BUILD_TYPE=Release - env: COMPILER=clang-8.0.0 BUILD_TYPE=Release - env: COMPILER=clang-9.0.0 BUILD_TYPE=Release - env: COMPILER=clang-10.0.0 BUILD_TYPE=Release - - env: COMPILER=gcc-9.3.0 BUILD_TYPE=Debug + - env: COMPILER=gcc-10.3.0 BUILD_TYPE=Debug before_install: - docker pull mariokonrad/marnav:${COMPILER} diff --git a/README.md b/README.md index 0707c809..e4435b44 100644 --- a/README.md +++ b/README.md @@ -348,6 +348,7 @@ Compiler: - GCC 8 - GCC 9 - GCC 10 +- GCC 11 - Clang 4 - Clang 5 - Clang 6 diff --git a/bin/docker-build.sh b/bin/docker-build.sh index 66ce1972..a673abc1 100755 --- a/bin/docker-build.sh +++ b/bin/docker-build.sh @@ -16,6 +16,7 @@ supported_compilers=( "gcc-10.1.0" "gcc-10.2.0" "gcc-10.3.0" + "gcc-11.1.0" "clang-5.0.2" "clang-6.0.0" "clang-7.1.0" diff --git a/bin/docker-prepare-image.sh b/bin/docker-prepare-image.sh index 30f70135..b4fe1e58 100755 --- a/bin/docker-prepare-image.sh +++ b/bin/docker-prepare-image.sh @@ -15,6 +15,7 @@ supported_compilers=( "gcc-10.1.0" "gcc-10.2.0" "gcc-10.3.0" + "gcc-11.1.0" # "clang-3.6.1" # "clang-3.6.2" # "clang-3.7.0" diff --git a/doc/devenv.dox b/doc/devenv.dox index 8a86efc7..75eee9a8 100644 --- a/doc/devenv.dox +++ b/doc/devenv.dox @@ -15,6 +15,7 @@ Compiler supported (older/others may work, but not tested): - GCC 8 - GCC 9 - GCC 10 +- GCC 11 - Clang 4 - Clang 5 - Clang 6 -- 2.11.4.GIT