Skip to content

Commit f494508

Browse files
authored
Merge pull request #10 from LLNL/task/white238/deprecate_ubuntu_20
deprecate older Ubuntus
2 parents b43db41 + a3fd38b commit f494508

File tree

12 files changed

+19
-106
lines changed

12 files changed

+19
-106
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ dockerbuild:
129129
key: ubuntu
130130
name: ghcr.io/rse-ops/ubuntu
131131
type: container
132-
startat: "20.04"
132+
startat: "22.04"
133133
filter:
134134
- "^[0-9]+[.]04$"
135135
```

ubuntu/20.04/Dockerfile

Lines changed: 0 additions & 13 deletions
This file was deleted.

ubuntu/22.04/Dockerfile

Lines changed: 0 additions & 14 deletions
This file was deleted.

ubuntu/23.04/Dockerfile

Lines changed: 0 additions & 14 deletions
This file was deleted.

ubuntu/clang/uptodate.yaml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,8 @@ dockerbuild:
33

44
matrix:
55
llvm_version:
6-
- "10"
7-
- "11"
8-
- "12"
9-
- "13"
10-
- "14"
11-
- "15"
126
- "19"
137
ubuntu_version:
14-
- "20.04"
15-
- "20.04"
16-
- "20.04"
17-
- "22.04"
18-
- "22.04"
19-
- "22.04"
208
- "24.04"
219

2210
build_args:

ubuntu/cuda/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ARG ubuntu_version
2-
FROM ghcr.io/llnl/radiuss:gcc-12-ubuntu-${ubuntu_version}
2+
FROM ghcr.io/llnl/radiuss:gcc-14-ubuntu-${ubuntu_version}
33

44
ARG cuda_version
55
ENV cuda_version=$cuda_version

ubuntu/cuda/uptodate.yaml

Lines changed: 9 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3,35 +3,17 @@ dockerbuild:
33

44
matrix:
55
cuda_version:
6-
- "11-0"
7-
- "11-1"
8-
- "11-2"
9-
- "11-3"
10-
- "11-4"
11-
- "11-5"
12-
- "11-6"
13-
- "11-7"
14-
- "11-8"
15-
- "12-0"
16-
- "12-1"
17-
- "12-2"
18-
- "12-3"
6+
- "12-5"
7+
- "12-6"
8+
- "12-8"
9+
- "12-9"
1910
- "13-0"
2011
ubuntu_version:
21-
- "22.04"
22-
- "22.04"
23-
- "22.04"
24-
- "22.04"
25-
- "22.04"
26-
- "22.04"
27-
- "22.04"
28-
- "22.04"
29-
- "22.04"
30-
- "22.04"
31-
- "22.04"
32-
- "22.04"
33-
- "22.04"
34-
- "22.04"
12+
- "24.04"
13+
- "24.04"
14+
- "24.04"
15+
- "24.04"
16+
- "24.04"
3517

3618
build_args:
3719
cuda_version:

ubuntu/gcc/uptodate.yaml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,17 @@
11
dockerbuild:
22
container_basename: radiuss
33

4-
exclude:
5-
gcc_version: ["11", "12", "13", "8", "9", "10"]
6-
ubuntu_version: ["20.04", "20.04", "20.04", "22.04", "22.04", "22.04"]
7-
84
build_args:
95
gcc_version:
106
key: gcc
117
versions:
12-
- "8"
13-
- "9"
14-
- "10" #20.04
158
- "11"
169
- "12"
1710
- "13"
11+
- "14"
1812

1913
# Look for ubuntu versions for our base builds
2014
ubuntu_version:
2115
key: ubuntu
2216
versions:
23-
- "20.04"
24-
- "22.04"
17+
- "24.04"

ubuntu/hip/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG hip_version
22
ARG ubuntu_version
3-
FROM ghcr.io/llnl/radiuss:gcc-9-ubuntu-${ubuntu_version}
3+
FROM ghcr.io/llnl/radiuss:gcc-13-ubuntu-${ubuntu_version}
44

55
ARG hip_version
66
ENV hip_version=$hip_version

ubuntu/hip/uptodate.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@ dockerbuild:
33

44
matrix:
55
ubuntu_version:
6-
- "20.04"
7-
- "20.04"
6+
- "24.04"
87
hip_version:
9-
- "5.6.1"
10-
- "6.0.2"
8+
- "6.4.3"
119

1210
build_args:
1311
hip_version:

0 commit comments

Comments
 (0)