Skip to content

Commit

Permalink
#2: remove obsolete image ubuntu 18 gcc8
Browse files Browse the repository at this point in the history
  • Loading branch information
tlamonthezie committed Dec 19, 2024
1 parent 8a94864 commit 37aadfb
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 173 deletions.
23 changes: 1 addition & 22 deletions ci/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ defaults:
:/opt/nvcc_wrapper/build\
:/opt/vtk/bin\
:"

# Define for which CI runner type to make test setup available in the CI matrix
runner-types: &runner-types [ github, azure ]

# List of all available test configurations
Expand All @@ -79,14 +79,6 @@ setup:
mpich: { env: { CC: clang, CXX: clang++ }, args: ['3.3.2', '-j4'] }

# ubuntu / gcc
amd64-ubuntu-18.04-gcc-8-gcc-8-cpp:
label: gcc-8, ubuntu, mpich
env: { <<: *env, CC: gcc-8, CXX: g++-8 }
deps:
packages: !extend [ *apt-packages, gcc-8, g++-8 ]
cmake: ['3.23.4']
mpich: { env: { CC: gcc-8, CXX: g++-8 }, args: [ '3.3.2', '-j4' ] }

amd64-ubuntu-20.04-gcc-9-cpp:
label: gcc-9, ubuntu, mpich
env: { <<: *env, CC: gcc-9, CXX: g++-9 }
Expand Down Expand Up @@ -288,14 +280,6 @@ images:
setup: amd64-alpine-clang-13-cpp

# ubuntu / gcc
-
repository: *docker-repository
tag: wf-amd64-ubuntu-18.04-gcc-8-cpp
dockerfile: base.dockerfile
arch: linux/amd64
base: ubuntu:18.04
setup: amd64-ubuntu-18.04-gcc-8-gcc-8-cpp

-
repository: *docker-repository
tag: wf-amd64-ubuntu-20.04-gcc-9-cpp
Expand Down Expand Up @@ -477,11 +461,6 @@ runners:
image: { repository: *docker-repository, tag: wf-amd64-ubuntu-20.04-icpx-cpp }

# ubuntu / gcc
-
type: *runner-types
runs-on: ubuntu-20.04
image: { repository: *docker-repository, tag: wf-amd64-ubuntu-18.04-gcc-8-cpp }

-
type: *runner-types
runs-on: ubuntu-20.04
Expand Down
6 changes: 0 additions & 6 deletions ci/shared/matrix/azure.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,6 @@
"image": "lifflander1/vt:wf-amd64-ubuntu-20.04-icpx-cpp",
"name": "wf-amd64-ubuntu-20.04-icpx-cpp"
},
"wf-amd64-ubuntu-18-04-gcc-8-cpp": {
"label": "gcc-8, ubuntu, mpich",
"vmImage": "ubuntu-20.04",
"image": "lifflander1/vt:wf-amd64-ubuntu-18.04-gcc-8-cpp",
"name": "wf-amd64-ubuntu-18.04-gcc-8-cpp"
},
"wf-amd64-ubuntu-20-04-gcc-9-cpp": {
"label": "gcc-9, ubuntu, mpich",
"vmImage": "ubuntu-20.04",
Expand Down
6 changes: 0 additions & 6 deletions ci/shared/matrix/github.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,6 @@
"image": "lifflander1/vt:wf-amd64-ubuntu-20.04-icpx-cpp",
"name": "wf-amd64-ubuntu-20.04-icpx-cpp"
},
{
"label": "gcc-8, ubuntu, mpich",
"runs-on": "ubuntu-20.04",
"image": "lifflander1/vt:wf-amd64-ubuntu-18.04-gcc-8-cpp",
"name": "wf-amd64-ubuntu-18.04-gcc-8-cpp"
},
{
"label": "gcc-9, ubuntu, mpich",
"runs-on": "ubuntu-20.04",
Expand Down
139 changes: 0 additions & 139 deletions ci/shared/scripts/setup-amd64-ubuntu-18.04-gcc-8-gcc-8-cpp.sh

This file was deleted.

0 comments on commit 37aadfb

Please sign in to comment.