Skip to content

Commit ce47c36

Browse files
AlexandreSingerAlexandreSinger
committed
[CI] Upgraded Runners to Ubuntu 24.04
Upgraded the GitHub-hosted runners from Ubuntu 22.04 to Ubuntu 24.04. This ensures that all changes to VTR will work on the most recent version of Ubuntu (as well as being warning clean). Removed the prior tests for Ubuntu 24.04. Added a tests to ensure Ubuntu 22.04 remains warning clean as well.
1 parent 0b20db9 commit ce47c36

File tree

5 files changed

+57
-101
lines changed

5 files changed

+57
-101
lines changed

‎.github/scripts/install_dependencies.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ sudo apt install -y \
1111
binutils-gold \
1212
build-essential \
1313
capnproto \
14-
ament-cmake \
1514
exuberant-ctags \
1615
curl \
1716
doxygen \
@@ -52,10 +51,11 @@ sudo apt install -y \
5251
gcc-11 \
5352
g++-12 \
5453
gcc-12 \
55-
clang-11 \
56-
clang-12 \
57-
clang-13 \
58-
clang-14 \
54+
g++-13 \
55+
gcc-13 \
56+
clang-16 \
57+
clang-17 \
58+
clang-18 \
5959
clang-format-14 \
6060
libtbb-dev
6161

‎.github/scripts/install_noble_dependencies.sh renamed to ‎.github/scripts/install_jammy_dependencies.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,6 @@ sudo apt install -y \
5151
gcc-11 \
5252
g++-12 \
5353
gcc-12 \
54-
g++-13 \
55-
gcc-13 \
56-
clang-14 \
57-
clang-18 \
5854
clang-format-14 \
5955
libtbb-dev
6056

‎.github/workflows/noble.yml

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

‎.github/workflows/test.yml

Lines changed: 43 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ concurrency:
3131

3232
env:
3333
# default compiler for all non-compatibility tests
34-
MATRIX_EVAL: "CC=gcc-11 && CXX=g++-11"
34+
MATRIX_EVAL: "CC=gcc-13 && CXX=g++-13"
3535

3636
jobs:
3737
Build:
3838
name: 'B: Building VtR'
39-
runs-on: ubuntu-22.04
39+
runs-on: ubuntu-24.04
4040
strategy:
4141
fail-fast: false
4242
matrix:
@@ -48,7 +48,7 @@ jobs:
4848

4949
- uses: actions/setup-python@v5
5050
with:
51-
python-version: 3.10.10
51+
python-version: 3.12.3
5252
- uses: actions/checkout@v4
5353
with:
5454
submodules: 'true'
@@ -72,7 +72,7 @@ jobs:
7272
7373
7474
Format:
75-
runs-on: ubuntu-22.04
75+
runs-on: ubuntu-24.04
7676
strategy:
7777
fail-fast: false
7878
matrix:
@@ -83,6 +83,8 @@ jobs:
8383
name: 'F: ${{ matrix.name }}'
8484
steps:
8585

86+
# TODO: This should be on the same version of Python as would be found on
87+
# Ubuntu 24.04 (3.12.3); however that version has some linting errors.
8688
- uses: actions/setup-python@v5
8789
with:
8890
python-version: 3.10.10
@@ -97,12 +99,12 @@ jobs:
9799

98100
UniTests:
99101
name: 'U: C++ Unit Tests'
100-
runs-on: ubuntu-22.04
102+
runs-on: ubuntu-24.04
101103
steps:
102104

103105
- uses: actions/setup-python@v5
104106
with:
105-
python-version: 3.10.10
107+
python-version: 3.12.3
106108
- uses: actions/checkout@v4
107109
with:
108110
submodules: 'true'
@@ -123,12 +125,12 @@ jobs:
123125

124126
Warnings:
125127
name: 'W: Check Compilation Warnings'
126-
runs-on: ubuntu-22.04
128+
runs-on: ubuntu-24.04
127129
steps:
128130

129131
- uses: actions/setup-python@v5
130132
with:
131-
python-version: 3.10.10
133+
python-version: 3.12.3
132134
- uses: actions/checkout@v4
133135
with:
134136
submodules: 'true'
@@ -154,32 +156,32 @@ jobs:
154156
155157
156158
Regression:
157-
runs-on: ubuntu-22.04
159+
runs-on: ubuntu-24.04
158160
strategy:
159161
fail-fast: false
160162
matrix:
161163
include: [
162164
{
163165
name: 'Basic',
164-
params: '-DCMAKE_COMPILE_WARNING_AS_ERROR=on -DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on',
166+
params: '-DCMAKE_COMPILE_WARNING_AS_ERROR=on -DVTR_IPO_BUILD=off -DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on',
165167
suite: 'vtr_reg_basic',
166168
extra_pkgs: ""
167169
},
168170
{
169171
name: 'Basic with highest assertion level',
170-
params: '-DCMAKE_COMPILE_WARNING_AS_ERROR=on -DVTR_ASSERT_LEVEL=4 -DWITH_BLIFEXPLORER=on',
172+
params: '-DCMAKE_COMPILE_WARNING_AS_ERROR=on -DVTR_IPO_BUILD=off -DVTR_ASSERT_LEVEL=4 -DWITH_BLIFEXPLORER=on',
171173
suite: 'vtr_reg_basic',
172174
extra_pkgs: ""
173175
},
174176
{
175177
name: 'Basic_odin',
176-
params: '-DCMAKE_COMPILE_WARNING_AS_ERROR=on -DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DWITH_PARMYS=OFF -DWITH_ODIN=on',
178+
params: '-DCMAKE_COMPILE_WARNING_AS_ERROR=on -DVTR_IPO_BUILD=off -DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DWITH_PARMYS=OFF -DWITH_ODIN=on',
177179
suite: 'vtr_reg_basic_odin',
178180
extra_pkgs: ""
179181
},
180182
{
181183
name: 'Basic with NO_GRAPHICS',
182-
params: '-DCMAKE_COMPILE_WARNING_AS_ERROR=on -DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DVPR_USE_EZGL=off',
184+
params: '-DCMAKE_COMPILE_WARNING_AS_ERROR=on -DVTR_IPO_BUILD=off -DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DVPR_USE_EZGL=off',
183185
suite: 'vtr_reg_basic',
184186
extra_pkgs: ""
185187
},
@@ -191,25 +193,25 @@ jobs:
191193
},
192194
{
193195
name: 'Basic with CAPNPROTO disabled',
194-
params: '-DCMAKE_COMPILE_WARNING_AS_ERROR=on -DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DVTR_ENABLE_CAPNPROTO=off',
196+
params: '-DCMAKE_COMPILE_WARNING_AS_ERROR=on -DVTR_IPO_BUILD=off -DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DVTR_ENABLE_CAPNPROTO=off',
195197
suite: 'vtr_reg_basic',
196198
extra_pkgs: ""
197199
},
198200
{
199201
name: 'Basic with VTR_ENABLE_DEBUG_LOGGING',
200-
params: '-DCMAKE_COMPILE_WARNING_AS_ERROR=on -DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DVTR_ENABLE_DEBUG_LOGGING=on',
202+
params: '-DCMAKE_COMPILE_WARNING_AS_ERROR=on -DVTR_IPO_BUILD=off -DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DVTR_ENABLE_DEBUG_LOGGING=on',
201203
suite: 'vtr_reg_basic',
202204
extra_pkgs: ""
203205
},
204206
{
205207
name: 'Basic_odin with VTR_ENABLE_DEBUG_LOGGING',
206-
params: '-DCMAKE_COMPILE_WARNING_AS_ERROR=on -DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DVTR_ENABLE_DEBUG_LOGGING=on -DWITH_PARMYS=OFF -DWITH_ODIN=on',
208+
params: '-DCMAKE_COMPILE_WARNING_AS_ERROR=on -DVTR_IPO_BUILD=off -DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DVTR_ENABLE_DEBUG_LOGGING=on -DWITH_PARMYS=OFF -DWITH_ODIN=on',
207209
suite: 'vtr_reg_basic_odin',
208210
extra_pkgs: ""
209211
},
210212
{
211213
name: 'Strong',
212-
params: '-DCMAKE_COMPILE_WARNING_AS_ERROR=on -DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on',
214+
params: '-DCMAKE_COMPILE_WARNING_AS_ERROR=on -DVTR_IPO_BUILD=off -DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on',
213215
suite: 'vtr_reg_strong',
214216
extra_pkgs: "libeigen3-dev"
215217
},
@@ -221,7 +223,7 @@ jobs:
221223
},
222224
{
223225
name: 'Valgrind Memory',
224-
params: '-DCMAKE_COMPILE_WARNING_AS_ERROR=on -DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DWITH_ODIN=on',
226+
params: '-DCMAKE_COMPILE_WARNING_AS_ERROR=on -DVTR_IPO_BUILD=off -DVTR_ASSERT_LEVEL=3 -DWITH_BLIFEXPLORER=on -DWITH_ODIN=on',
225227
suite: 'vtr_reg_valgrind_small',
226228
extra_pkgs: ""
227229
}
@@ -231,7 +233,7 @@ jobs:
231233

232234
- uses: actions/setup-python@v5
233235
with:
234-
python-version: 3.10.10
236+
python-version: 3.12.3
235237

236238
- uses: actions/checkout@v4
237239
with:
@@ -281,7 +283,7 @@ jobs:
281283
vtr_flow/**/parse_results*.txt
282284
283285
Sanitized:
284-
runs-on: ubuntu-22.04
286+
runs-on: ubuntu-24.04
285287
strategy:
286288
fail-fast: false
287289
matrix:
@@ -300,7 +302,7 @@ jobs:
300302

301303
- uses: actions/setup-python@v5
302304
with:
303-
python-version: 3.10.10
305+
python-version: 3.12.3
304306
- uses: actions/checkout@v4
305307
with:
306308
submodules: 'true'
@@ -335,12 +337,12 @@ jobs:
335337
336338
Parmys:
337339
name: 'Parmys Basic Test'
338-
runs-on: ubuntu-22.04
340+
runs-on: ubuntu-24.04
339341
steps:
340342

341343
- uses: actions/setup-python@v5
342344
with:
343-
python-version: 3.10.10
345+
python-version: 3.12.3
344346
- uses: actions/checkout@v4
345347
with:
346348
submodules: 'true'
@@ -367,12 +369,12 @@ jobs:
367369
368370
ODINII:
369371
name: 'ODIN-II Basic Test'
370-
runs-on: ubuntu-22.04
372+
runs-on: ubuntu-24.04
371373
steps:
372374

373375
- uses: actions/setup-python@v5
374376
with:
375-
python-version: 3.10.10
377+
python-version: 3.12.3
376378
- uses: actions/checkout@v4
377379
with:
378380
submodules: 'true'
@@ -400,12 +402,12 @@ jobs:
400402
401403
VQM2BLIF:
402404
name: 'VQM2BLIF Basic Tests'
403-
runs-on: ubuntu-22.04
405+
runs-on: ubuntu-24.04
404406
steps:
405407

406408
- uses: actions/setup-python@v5
407409
with:
408-
python-version: 3.10.10
410+
python-version: 3.12.3
409411
- uses: actions/checkout@v4
410412
with:
411413
submodules: 'true'
@@ -429,7 +431,7 @@ jobs:
429431
./utils/vqm2blif/test/scripts/test_vqm2blif.sh
430432
431433
Compatibility:
432-
runs-on: ubuntu-22.04
434+
runs-on: ubuntu-24.04
433435
strategy:
434436
fail-fast: false
435437
matrix:
@@ -438,16 +440,15 @@ jobs:
438440
- { name: 'GCC 10 (Ubuntu Jammy - 22.04)', eval: 'CC=gcc-10 && CXX=g++-10', }
439441
- { name: 'GCC 11 (Ubuntu Jammy - 22.04)', eval: 'CC=gcc-11 && CXX=g++-11', }
440442
- { name: 'GCC 12 (Ubuntu Jammy - 22.04)', eval: 'CC=gcc-12 && CXX=g++-12', }
441-
- { name: 'Clang 11 (Ubuntu Jammy - 22.04)', eval: 'CC=clang-11 && CXX=clang++-11', }
442-
- { name: 'Clang 12 (Ubuntu Jammy - 22.04)', eval: 'CC=clang-12 && CXX=clang++-12', }
443-
- { name: 'Clang 13 (Ubuntu Jammy - 22.04)', eval: 'CC=clang-13 && CXX=clang++-13', }
444-
- { name: 'Clang 14 (Ubuntu Jammy - 22.04)', eval: 'CC=clang-14 && CXX=clang++-14', }
443+
- { name: 'Clang 16 (Ubuntu Jammy - 22.04)', eval: 'CC=clang-16 && CXX=clang++-16', }
444+
- { name: 'Clang 17 (Ubuntu Jammy - 22.04)', eval: 'CC=clang-17 && CXX=clang++-17', }
445+
- { name: 'Clang 18 (Ubuntu Jammy - 22.04)', eval: 'CC=clang-18 && CXX=clang++-18', }
445446
name: 'B: ${{ matrix.name }}'
446447
steps:
447448

448449
- uses: actions/setup-python@v5
449450
with:
450-
python-version: 3.10.10
451+
python-version: 3.12.3
451452
- uses: actions/checkout@v4
452453
with:
453454
submodules: 'true'
@@ -471,13 +472,13 @@ jobs:
471472
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
472473
./.github/scripts/build.sh
473474
474-
NobleCompatibility:
475-
name: 'Ubuntu Noble - 24.04 Compatibility Test'
476-
runs-on: ubuntu-24.04
475+
JammyCompatibility:
476+
name: 'Ubuntu Jammy - 22.04 Compatibility Test'
477+
runs-on: ubuntu-22.04
477478
steps:
478479
- uses: actions/setup-python@v5
479480
with:
480-
python-version: 3.12.3
481+
python-version: 3.10.10
481482

482483
- uses: actions/checkout@v4
483484
with:
@@ -488,14 +489,14 @@ jobs:
488489
id: cpu-cores
489490

490491
- name: Install Dependencies
491-
run: ./.github/scripts/install_noble_dependencies.sh
492+
run: ./.github/scripts/install_jammy_dependencies.sh
492493

493494
- uses: hendrikmuhs/[email protected]
494495

495496
- name: Test
496497
env:
497498
CMAKE_PARAMS: "-DVTR_ASSERT_LEVEL=3 -DCMAKE_COMPILE_WARNING_AS_ERROR=on -DVTR_IPO_BUILD=off"
498-
MATRIX_EVAL: 'CC=gcc-13 && CXX=g++-13'
499+
MATRIX_EVAL: 'CC=gcc-11 && CXX=g++-11'
499500
BUILD_TYPE: release
500501
NUM_PROC: ${{ steps.cpu-cores.outputs.count }}
501502
run: |
@@ -515,12 +516,12 @@ jobs:
515516
- ODINII
516517
- VQM2BLIF
517518
- Compatibility
518-
runs-on: ubuntu-22.04
519+
runs-on: ubuntu-24.04
519520
steps:
520521

521522
- uses: actions/setup-python@v5
522523
with:
523-
python-version: 3.10.10
524+
python-version: 3.12.3
524525
- uses: actions/checkout@v4
525526
with:
526527
submodules: 'true'
@@ -543,3 +544,4 @@ jobs:
543544
run: |
544545
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
545546
./.github/scripts/build.sh
547+

0 commit comments

Comments
 (0)