Skip to content

Commit 191b588

Browse files
committed
CI: Remove ubuntu 20.04 workflows, replacing with 22.04 or manylinux_2_28
Closes #1271
1 parent 6230927 commit 191b588

7 files changed

Lines changed: 20 additions & 73 deletions

File tree

.github/workflows/CMake.yml

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ jobs:
2626
# Multiplicative build matrix
2727
matrix:
2828
cudacxx:
29-
- cuda: "11.0"
29+
- cuda: "11.7"
3030
cuda_arch: "35"
31-
hostcxx: gcc-8
32-
os: ubuntu-20.04
31+
hostcxx: gcc-9
32+
os: ubuntu-22.04
3333
python:
3434
- "3.8"
3535
config:
@@ -110,25 +110,13 @@ jobs:
110110
- name: Install Visualisation Dependencies
111111
if: ${{ startswith(env.OS, 'ubuntu') && env.VISUALISATION == 'ON' }}
112112
run: |
113-
# Install ubuntu-20.04 packages
114-
if [ "$OS" == 'ubuntu-20.04' ]; then
113+
# Install ubuntu-22.04 packages
114+
if [ "$OS" == 'ubuntu-22.04' ]; then
115115
sudo apt-get install -y libglew-dev libfontconfig1-dev libsdl2-dev libdevil-dev libfreetype-dev
116116
fi
117-
# Install Ubuntu 18.04 packages
118-
if [ "$OS" == 'ubuntu-18.04' ]; then
119-
sudo apt-get install -y libglew-dev libfontconfig1-dev libsdl2-dev libdevil-dev libfreetype6-dev libgl1-mesa-dev
120-
fi
121117
122118
- name: Install Swig >= 4.0.2
123119
run: |
124-
# Remove existing swig install, so CMake finds the correct swig
125-
if [ "$OS" == 'ubuntu-20.04' ]; then
126-
sudo apt-get remove -y swig swig4.0
127-
fi
128-
# Install Ubuntu 18.04 packages
129-
if [ "$OS" == 'ubuntu-18.04' ]; then
130-
sudo apt-get remove -y swig
131-
fi
132120
# Install additional apt-based dependencies required to build swig 4.0.2
133121
sudo apt-get install -y bison
134122
# Create a local directory to build swig in.

.github/workflows/Docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ defaults:
2121

2222
jobs:
2323
doxygen:
24-
runs-on: ubuntu-20.04
24+
runs-on: ubuntu-22.04
2525
env:
2626
# Define constants
2727
BUILD_DIR: "build"

.github/workflows/Draft-Release.yml

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,7 @@ jobs:
5252
- cuda: "11.8"
5353
cuda_arch: "35-real;90-real;90-virtual"
5454
hostcxx: gcc-9
55-
os: ubuntu-20.04
56-
- cuda: "11.0"
57-
cuda_arch: "35-real;80-real;80-virtual"
58-
hostcxx: gcc-8
59-
os: ubuntu-20.04
55+
os: ubuntu-22.04
6056
python:
6157
- "3.8"
6258
config:
@@ -120,27 +116,12 @@ jobs:
120116
if: ${{ startswith(env.OS, 'ubuntu') && env.VISUALISATION == 'ON' }}
121117
run: |
122118
# Install ubuntu-22.04 packages
123-
if [ "$OS" == 'ubuntu-22.04' ]; then
124-
sudo apt-get install -y libglew-dev libfontconfig1-dev libsdl2-dev libdevil-dev libfreetype-dev
125-
fi
126-
# Install ubuntu-20.04 packages
127-
if [ "$OS" == 'ubuntu-20.04' ]; then
119+
if [ "$OS" == 'ubuntu-22.04' ]; then
128120
sudo apt-get install -y libglew-dev libfontconfig1-dev libsdl2-dev libdevil-dev libfreetype-dev
129121
fi
130-
# Install Ubuntu 18.04 packages
131-
if [ "$OS" == 'ubuntu-18.04' ]; then
132-
sudo apt-get install -y libglew-dev libfontconfig1-dev libsdl2-dev libdevil-dev libfreetype6-dev libgl1-mesa-dev
133-
fi
134122
135123
- name: Install Swig >= 4.0.2
136124
run: |
137-
# Remove existing swig install, so CMake finds the correct swig
138-
if [ "$OS" == 'ubuntu-20.04' ]; then
139-
sudo apt-get remove -y swig swig4.0
140-
fi
141-
if [ "$OS" == 'ubuntu-18.04' ]; then
142-
sudo apt-get remove -y swig
143-
fi
144125
# Install additional apt-based dependencies required to build swig 4.0.2
145126
sudo apt-get install -y bison
146127
# Create a local directory to build swig in.
@@ -615,7 +596,7 @@ jobs:
615596
- wheel-manylinux_2_28
616597
- wheel-windows
617598
if: ${{ success() && startsWith(github.ref, 'refs/tags/v') && github.event_name != 'workflow_dispatch' && github.event_name != 'pull_request' }}
618-
runs-on: ubuntu-20.04
599+
runs-on: ubuntu-22.04
619600
steps:
620601
- uses: actions/checkout@v4
621602

.github/workflows/Lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
matrix:
3232
cudacxx:
3333
- cuda: "11.8"
34-
os: ubuntu-20.04
34+
os: ubuntu-22.04
3535
env:
3636
# Define constants
3737
BUILD_DIR: "build"

.github/workflows/MPI.yml

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -175,25 +175,13 @@ jobs:
175175
- name: Install Visualisation Dependencies
176176
if: ${{ startswith(env.OS, 'ubuntu') && env.VISUALISATION == 'ON' }}
177177
run: |
178-
# Install ubuntu-20.04 packages
179-
if [ "$OS" == 'ubuntu-20.04' ]; then
178+
# Install ubuntu-22.04 packages
179+
if [ "$OS" == 'ubuntu-22.04' ]; then
180180
sudo apt-get install -y libglew-dev libfontconfig1-dev libsdl2-dev libdevil-dev libfreetype-dev
181181
fi
182-
# Install Ubuntu 18.04 packages
183-
if [ "$OS" == 'ubuntu-18.04' ]; then
184-
sudo apt-get install -y libglew-dev libfontconfig1-dev libsdl2-dev libdevil-dev libfreetype6-dev libgl1-mesa-dev
185-
fi
186182
187183
- name: Install Swig >= 4.0.2
188184
run: |
189-
# Remove existing swig install, so CMake finds the correct swig
190-
if [ "$OS" == 'ubuntu-20.04' ]; then
191-
sudo apt-get remove -y swig swig4.0
192-
fi
193-
# Install Ubuntu 18.04 packages
194-
if [ "$OS" == 'ubuntu-18.04' ]; then
195-
sudo apt-get remove -y swig
196-
fi
197185
# Install additional apt-based dependencies required to build swig 4.0.2
198186
sudo apt-get install -y bison
199187
# Create a local directory to build swig in.

.github/workflows/Manylinux_2_28.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ jobs:
3737
cuda_arch: "50"
3838
hostcxx: gcc-toolset-12
3939
os: ubuntu-22.04
40+
- cuda: "11.8"
41+
cuda_arch: "35"
42+
hostcxx: gcc-toolset-10
43+
os: ubuntu-22.04
4044
- cuda: "11.2"
4145
cuda_arch: "35"
4246
hostcxx: gcc-toolset-9

.github/workflows/Ubuntu.yml

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,11 @@ jobs:
4141
cuda_arch: "35"
4242
hostcxx: gcc-11
4343
os: ubuntu-22.04
44-
- cuda: "11.0"
44+
# 11.7 is the oldest supported CUDA on 22.04
45+
- cuda: "11.7"
4546
cuda_arch: "35"
46-
hostcxx: gcc-8
47-
os: ubuntu-20.04
47+
hostcxx: gcc-9
48+
os: ubuntu-22.04
4849
python:
4950
- "3.12"
5051
config:
@@ -144,24 +145,9 @@ jobs:
144145
if [ "$OS" == 'ubuntu-22.04' ]; then
145146
sudo apt-get install -y libglew-dev libfontconfig1-dev libsdl2-dev libdevil-dev libfreetype-dev
146147
fi
147-
# Install ubuntu-20.04 packages
148-
if [ "$OS" == 'ubuntu-20.04' ]; then
149-
sudo apt-get install -y libglew-dev libfontconfig1-dev libsdl2-dev libdevil-dev libfreetype-dev
150-
fi
151-
# Install Ubuntu 18.04 packages
152-
if [ "$OS" == 'ubuntu-18.04' ]; then
153-
sudo apt-get install -y libglew-dev libfontconfig1-dev libsdl2-dev libdevil-dev libfreetype6-dev libgl1-mesa-dev
154-
fi
155148
156149
- name: Install Swig >= 4.0.2
157150
run: |
158-
# Remove existing swig install, so CMake finds the correct swig
159-
if [ "$OS" == 'ubuntu-20.04' ]; then
160-
sudo apt-get remove -y swig swig4.0
161-
fi
162-
if [ "$OS" == 'ubuntu-18.04' ]; then
163-
sudo apt-get remove -y swig
164-
fi
165151
# Install additional apt-based dependencies required to build swig 4.0.2
166152
sudo apt-get install -y bison
167153
# Create a local directory to build swig in.

0 commit comments

Comments
 (0)