From 434de5df25d6971303b9646f6d0b5e813d4fc174 Mon Sep 17 00:00:00 2001 From: Arkadiusz Szczepkowicz Date: Mon, 30 Sep 2024 16:00:27 +0200 Subject: [PATCH] #2286: Remove gcc-8 references --- .github/workflows/build-docs.yml | 4 ++-- ci/docker/ubuntu-gnu-docs.dockerfile | 2 +- docker-compose.yml | 8 ++++---- docs/md/building.md | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml index 7a73fd7950..3866158217 100644 --- a/.github/workflows/build-docs.yml +++ b/.github/workflows/build-docs.yml @@ -16,8 +16,8 @@ jobs: ARCH: amd64 UBUNTU: 18.04 COMPILER_TYPE: gnu - COMPILER: gcc-8 - HOST_COMPILER: gcc-8 + COMPILER: gcc-9 + HOST_COMPILER: gcc-9 BUILD_TYPE: release ULIMIT_CORE: 0 VT_LB: 1 diff --git a/ci/docker/ubuntu-gnu-docs.dockerfile b/ci/docker/ubuntu-gnu-docs.dockerfile index 09038c97ff..6bdc74eae6 100644 --- a/ci/docker/ubuntu-gnu-docs.dockerfile +++ b/ci/docker/ubuntu-gnu-docs.dockerfile @@ -2,7 +2,7 @@ ARG arch=amd64 FROM ${arch}/ubuntu:18.04 as base ARG proxy="" -ARG compiler=gcc-8 +ARG compiler=gcc-9 ARG token ENV https_proxy=${proxy} \ diff --git a/docker-compose.yml b/docker-compose.yml index b4916434ae..c00e1aed43 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ # Variables: # ARCH={amd64, arm64v8, ...} # COMPILER_TYPE={gnu, clang, intel, nvidia} -# COMPILER={gcc-8, gcc-9, gcc-10, +# COMPILER={gcc-9, gcc-10, # clang-8, clang-9, clang-10, # icpc, icpx, # nvcc-11, nvcc-11.2} @@ -55,11 +55,11 @@ # $ docker compose run ubuntu-cpp-interactive # # /vt/ci/build_cpp.sh /vt /build # -# For a non-interactive build with gcc-8, since gnu is the default compiler +# For a non-interactive build with gcc-9, since gnu is the default compiler # type, one may do the following: # -# $ COMPILER=gcc-8 docker compose pull ubuntu-cpp -# $ COMPILER=gcc-8 docker compose run ubuntu-cpp +# $ COMPILER=gcc-9 docker compose pull ubuntu-cpp +# $ COMPILER=gcc-9 docker compose run ubuntu-cpp # # Volume will be created automatically for each combination of parameters. diff --git a/docs/md/building.md b/docs/md/building.md index e86466d0e3..8add1b9429 100644 --- a/docs/md/building.md +++ b/docs/md/building.md @@ -139,7 +139,7 @@ which `docker compose` will read. # Variables: # ARCH={amd64, arm64v8, ...} # COMPILER_TYPE={gnu, clang, intel, nvidia} -# COMPILER={gcc-8, gcc-9, gcc-10, +# COMPILER={gcc-9, gcc-10, # clang-8, clang-9, clang-10, # icpc, icpx, # nvcc-11, nvcc-11.2}