diff --git a/.env b/.env index da82ce84c9..b1e6d3c01e 100644 --- a/.env +++ b/.env @@ -1,8 +1,8 @@ REPO=lifflander1/vt ARCH=amd64 -UBUNTU=18.04 +UBUNTU=22.04 ULIMIT_CORE=0 -COMPILER=gcc-7 +COMPILER=gcc-12 COMPILER_TYPE=gnu PROXY= CACHE= diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml index dbb595636f..adee0fdc5d 100644 --- a/.github/workflows/build-docs.yml +++ b/.github/workflows/build-docs.yml @@ -4,6 +4,7 @@ on: push: branches: - develop + - 2107-remove-obsolete-builds jobs: @@ -14,9 +15,9 @@ jobs: env: REPO: lifflander1/vt ARCH: amd64 - UBUNTU: 18.04 + UBUNTU: 22.04 COMPILER_TYPE: gnu - COMPILER: gcc-7 + COMPILER: gcc-12 BUILD_TYPE: release ULIMIT_CORE: 0 VT_LB: 1 diff --git a/README.md b/README.md index 51d72e0bae..1c44d1c59e 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,6 @@ [![codecov](https://codecov.io/gh/DARMA-tasking/vt/branch/develop/graph/badge.svg)](https://codecov.io/gh/DARMA-tasking/vt) [![License](https://img.shields.io/badge/License-BSD%203--Clause-orange.svg)](https://opensource.org/licenses/BSD-3-Clause) ![](https://github.com/DARMA-tasking/vt/workflows/Docker%20Image%20CI/badge.svg) -[![gcc-7, ubuntu, mpich, trace runtime, LB](https://dev.azure.com/DARMA-tasking/DARMA/_apis/build/status/PR%20tests%20(gcc-7%2C%20ubuntu%2C%20mpich%2C%20trace%20runtime%2C%20LB)?branchName=develop&Label=(gcc-7%2C%20ubuntu%2C%20mpich%2C%20trace%20runtime%2C%20LB))](https://dev.azure.com/DARMA-tasking/DARMA/_build/latest?definitionId=8&branchName=develop) [![gcc-8, ubuntu, mpich, address sanitizer](https://dev.azure.com/DARMA-tasking/DARMA/_apis/build/status/PR%20tests%20(gcc-8%2C%20ubuntu%2C%20mpich%2C%20address%20sanitizer)?branchName=develop&Label=(gcc-8%2C%20ubuntu%2C%20mpich%2C%20address%20sanitizer))](https://dev.azure.com/DARMA-tasking/DARMA/_build/latest?definitionId=9&branchName=develop) [![gcc-9, ubuntu, mpich, zoltan](https://dev.azure.com/DARMA-tasking/DARMA/_apis/build/status/PR%20tests%20(gcc-9%2C%20ubuntu%2C%20mpich%2C%20zoltan)?branchName=develop&Label=(gcc-9%2C%20ubuntu%2C%20mpich%2C%20zoltan))](https://dev.azure.com/DARMA-tasking/DARMA/_build/latest?definitionId=10&branchName=develop) [![gcc-10, ubuntu, openmpi, no LB](https://dev.azure.com/DARMA-tasking/DARMA/_apis/build/status/PR%20tests%20(gcc-10%2C%20ubuntu%2C%20openmpi%2C%20no%20LB)?branchName=develop&Label=(gcc-10%2C%20ubuntu%2C%20openmpi%2C%20no%20LB))](https://dev.azure.com/DARMA-tasking/DARMA/_build/latest?definitionId=4&branchName=develop) diff --git a/ci/docker/develop.dockerfile b/ci/docker/develop.dockerfile index ba5cc734cc..d7409bd0d4 100644 --- a/ci/docker/develop.dockerfile +++ b/ci/docker/develop.dockerfile @@ -1,11 +1,11 @@ -ARG compiler=gcc-7 +ARG compiler=gcc-12 ARG arch=amd64 -ARG ubuntu=18.04 +ARG ubuntu=22.04 FROM lifflander1/vt:${arch}-ubuntu-${ubuntu}-${compiler}-cpp # All ARGs are invalidated after FROM instruction, so it has to be redefined -ARG compiler=gcc-7 +ARG compiler=gcc-12 ARG proxy="" ENV https_proxy=${proxy} \ diff --git a/ci/docker/ubuntu-18.04-gnu-docs.dockerfile b/ci/docker/ubuntu-gnu-docs.dockerfile similarity index 97% rename from ci/docker/ubuntu-18.04-gnu-docs.dockerfile rename to ci/docker/ubuntu-gnu-docs.dockerfile index b88af792e3..e35b93ca78 100644 --- a/ci/docker/ubuntu-18.04-gnu-docs.dockerfile +++ b/ci/docker/ubuntu-gnu-docs.dockerfile @@ -1,8 +1,8 @@ ARG arch=amd64 -FROM ${arch}/ubuntu:18.04 as base +FROM ${arch}/ubuntu:22.04 as base ARG proxy="" -ARG compiler=gcc-7 +ARG compiler=gcc-12 ARG token ENV https_proxy=${proxy} \ diff --git a/docker-compose.yml b/docker-compose.yml index f9048ba96d..f6194deeb4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,13 +10,12 @@ # Variables: # ARCH={amd64, arm64v8, ...} # COMPILER_TYPE={gnu, clang, intel, nvidia} -# COMPILER={gcc-7, gcc-8, gcc-9, gcc-10, -# clang-4.0, clang-5.0, clang-6.0, clang-7, clang-8, -# clang-9, clang-10, -# icpx, +# COMPILER={gcc-8, gcc-9, gcc-10, +# clang-8, clang-9, clang-10, +# icpc, icpx, # nvcc-11, nvcc-11.2} # REPO=lifflander1/vt -# UBUNTU={18.04, 20.04} +# UBUNTU={18.04, 20.04, 22.04} # ULIMIT_CORE=0 # # DARMA/vt Configuration Variables: @@ -70,43 +69,27 @@ version: '3.5' # add it to this list. For example, for ARM64v8 on Ubuntu 20.04 with clang-9, # add `arm64v8-ubuntu-20.04-clang-9-cache`. volumes: - amd64-ubuntu-18.04-clang-4.0-cache: - amd64-ubuntu-18.04-clang-5.0-cache: - amd64-ubuntu-18.04-clang-6.0-cache: - amd64-ubuntu-18.04-clang-7-cache: amd64-ubuntu-18.04-clang-8-cache: amd64-ubuntu-18.04-clang-9-cache: amd64-ubuntu-20.04-clang-10-cache: amd64-ubuntu-22.04-clang-11-cache: - amd64-ubuntu-18.04-gcc-7-cache: amd64-ubuntu-18.04-gcc-8-cache: amd64-ubuntu-20.04-gcc-9-cache: amd64-ubuntu-20.04-gcc-10-cache: + amd64-ubuntu-22.04-gcc-12-cache: amd64-ubuntu-18.04-icpx-cache: amd64-ubuntu-18.04-icpc-cache: amd64-ubuntu-18.04-nvcc-11-cache: amd64-ubuntu-18.04-nvcc-11.2-cache: - amd64-alpine-clang-4.0-cache: - amd64-alpine-clang-5.0-cache: - amd64-alpine-clang-6.0-cache: - amd64-alpine-clang-7-cache: - amd64-alpine-clang-8-cache: - amd64-alpine-clang-9-cache: amd64-alpine-clang-10-cache: amd64-alpine-clang-11-cache: - amd64-alpine-gcc-7-cache: amd64-alpine-gcc-8-cache: amd64-alpine-gcc-9-cache: amd64-alpine-gcc-10-cache: - amd64-alpine-icc-18-cache: - amd64-alpine-icc-19-cache: - amd64-alpine-icc-20-cache: amd64-alpine-icpx-cache: amd64-alpine-icpc-cache: amd64-alpine-nvcc-11-cache: amd64-alpine-nvcc-11.2-cache: - arm64v8-ubuntu-18.04-gcc-7-cache: - arm64v8-alpine-gcc-7-cache: # Define basic rules for ccache used across multiple services. The beauty of # docker compose with cached volumes is that similarly configured builds will @@ -158,8 +141,8 @@ x-vtopts: &vtopts services: ############################################################################## # C++ builds of VT on ubuntu/alpine platform from container baseline - # Ubuntu gcc-7 debug build: - # docker-compose run -e CMAKE_BUILD_TYPE=debug ubuntu-cpp|alpine-cpp + # Ubuntu gcc-12 debug build: + # docker-compose run -e CMAKE_BUILD_TYPE=debug ubuntu-cpp ubuntu-cpp: image: ${REPO}:${ARCH}-ubuntu-${UBUNTU}-${COMPILER}-cpp build: @@ -341,7 +324,7 @@ services: build: context: . target: base - dockerfile: ci/docker/ubuntu-${UBUNTU}-${COMPILER_TYPE}-docs.dockerfile + dockerfile: ci/docker/ubuntu-${COMPILER_TYPE}-docs.dockerfile cache_from: - ${REPO}:${ARCH}-ubuntu-${UBUNTU}-${COMPILER}-cpp args: @@ -387,7 +370,7 @@ services: build: context: . target: base - dockerfile: ci/docker/ubuntu-${UBUNTU}-${COMPILER_TYPE}-docs.dockerfile + dockerfile: ci/docker/ubuntu-${COMPILER_TYPE}-docs.dockerfile cache_from: - ${REPO}:${ARCH}-ubuntu-${UBUNTU}-${COMPILER}-cpp args: diff --git a/docs/md/building.md b/docs/md/building.md index d47c2b7048..4669cbfbee 100644 --- a/docs/md/building.md +++ b/docs/md/building.md @@ -139,13 +139,12 @@ which `docker-compose` will read. # Variables: # ARCH={amd64, arm64v8, ...} # COMPILER_TYPE={gnu, clang, intel, nvidia} -# COMPILER={gcc-7, gcc-8, gcc-9, gcc-10, -# clang-4.0, clang-5.0, clang-6.0, clang-7, clang-8, -# clang-9, clang-10, -# icc-18, icc-19, -# nvcc-10, nvcc-11, nvcc-11.2} +# COMPILER={gcc-8, gcc-9, gcc-10, +# clang-8, clang-9, clang-10, +# icpc, icpx, +# nvcc-11, nvcc-11.2} # REPO=lifflander1/vt -# UBUNTU={18.04, 20.04} +# UBUNTU={18.04, 20.04, 22.04} # ULIMIT_CORE=0 # # DARMA/vt Configuration Variables: