Skip to content

Commit ab2e17f

Browse files
vaughnbetzvaughnbetz
authored
Merge pull request #2258 from verilog-to-routing/ubuntu_22.04_dev
Migrate to Ubuntu 22.04 LTS
2 parents 99d71d9 + 11b03da commit ab2e17f

File tree

6 files changed

+105
-51
lines changed

6 files changed

+105
-51
lines changed

‎.github/scripts/hostsetup.sh‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ apt install -y \
3030
build-essential \
3131
capnproto \
3232
clang \
33-
ctags \
33+
exuberant-ctags \
3434
curl \
3535
doxygen \
3636
flex \
@@ -50,20 +50,21 @@ apt install -y \
5050
libxft-dev \
5151
libxml++2.6-dev \
5252
libreadline-dev \
53-
python \
53+
python2 \
5454
python3 \
5555
python3-dev \
5656
python3-pip \
5757
python3-virtualenv \
5858
python3-yaml \
59-
tcl-dev \
59+
tcllib \
60+
tcl8.6-dev \
6061
libffi-dev \
6162
perl \
6263
texinfo \
6364
time \
6465
valgrind \
6566
zip \
66-
qt5-default \
67+
qtbase5-dev \
6768
uuid-dev \
6869
default-jdk \
6970
g++-9 \
@@ -75,7 +76,7 @@ apt install -y \
7576
apt install -y apt-transport-https ca-certificates gnupg
7677
wget -qO - https://apt.kitware.com/keys/kitware-archive-latest.asc |apt-key add -
7778

78-
apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic main'
79+
apt-add-repository 'deb https://apt.kitware.com/ubuntu/ jammy main'
7980
apt update
8081
apt install -y cmake
8182

‎.github/scripts/install_dependencies.sh‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ sudo apt install -y \
1111
binutils-gold \
1212
build-essential \
1313
capnproto \
14-
cmake \
15-
ctags \
14+
ament-cmake \
15+
exuberant-ctags \
1616
curl \
1717
doxygen \
1818
flex \
@@ -31,31 +31,28 @@ sudo apt install -y \
3131
libxft-dev \
3232
libxml++2.6-dev \
3333
libreadline-dev \
34-
tcl-dev \
34+
tcllib \
35+
tcl8.6-dev \
3536
libffi-dev \
3637
perl \
38+
pkg-config \
3739
texinfo \
3840
time \
3941
valgrind \
4042
zip \
41-
qt5-default \
43+
qtbase5-dev \
4244
uuid-dev \
4345
default-jdk \
44-
clang-format-7 \
45-
g++-7 \
46-
gcc-7 \
47-
g++-8 \
48-
gcc-8 \
46+
clang \
47+
clang-format-12 \
4948
g++-9 \
5049
gcc-9 \
5150
g++-10 \
5251
gcc-10 \
5352
g++-11 \
5453
gcc-11 \
55-
clang-6.0 \
56-
clang-7 \
57-
clang-10 \
58-
libtbb-dev
54+
clang-12 \
55+
libtbb12
5956

6057
pip install -r requirements.txt
6158

‎.github/workflows/build_dependency_ubuntu-22.04.sh‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
#!/usr/bin/env bash
2+
3+
# The package list is designed for Ubuntu 20.04 LTS
4+
add-apt-repository -y ppa:ubuntu-toolchain-r/test
5+
apt-get update
6+
apt-get install -y \
7+
autoconf \
8+
automake \
9+
bison \
10+
ccache \
11+
cmake \
12+
exuberant-ctags \
13+
curl \
14+
doxygen \
15+
flex \
16+
fontconfig \
17+
gdb \
18+
git \
19+
gperf \
20+
iverilog \
21+
libc6-dev \
22+
libcairo2-dev \
23+
libevent-dev \
24+
libffi-dev \
25+
libfontconfig1-dev \
26+
liblist-moreutils-perl \
27+
libncurses5-dev \
28+
libreadline-dev \
29+
libreadline8 \
30+
libx11-dev \
31+
libxft-dev \
32+
libxml++2.6-dev \
33+
make \
34+
perl \
35+
pkg-config \
36+
python3 \
37+
python3-setuptools \
38+
python3-lxml \
39+
python3-pip \
40+
qtbase5-dev \
41+
tcllib \
42+
tcl8.6-dev \
43+
texinfo \
44+
time \
45+
valgrind \
46+
wget \
47+
zip \
48+
swig \
49+
expect \
50+
g++-9 \
51+
gcc-9 \
52+
g++-10 \
53+
gcc-10 \
54+
g++-11 \
55+
gcc-11 \
56+
clang \
57+
clang-12 \
58+
clang-format-12 \
59+
libxml2-utils

‎.github/workflows/test.yml‎

Lines changed: 27 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
# Prevents from running on forks where no custom runners are available
1919
if: ${{ github.repository_owner == 'verilog-to-routing' }}
2020

21-
container: ubuntu:bionic
21+
container: ubuntu:jammy
2222

2323
runs-on: [self-hosted, Linux, X64]
2424

@@ -76,7 +76,7 @@ jobs:
7676
7777
Build:
7878
name: 'B: Building VtR'
79-
runs-on: ubuntu-18.04
79+
runs-on: ubuntu-22.04
8080
strategy:
8181
fail-fast: false
8282
matrix:
@@ -88,7 +88,7 @@ jobs:
8888

8989
- uses: actions/setup-python@v4
9090
with:
91-
python-version: 3.6
91+
python-version: 3.10.10
9292
- uses: actions/checkout@v3
9393
- run: ./.github/scripts/install_dependencies.sh
9494

@@ -103,7 +103,7 @@ jobs:
103103
104104
105105
Format:
106-
runs-on: ubuntu-18.04
106+
runs-on: ubuntu-22.04
107107
strategy:
108108
fail-fast: false
109109
matrix:
@@ -116,7 +116,7 @@ jobs:
116116

117117
- uses: actions/setup-python@v4
118118
with:
119-
python-version: 3.6
119+
python-version: 3.10.10
120120
- uses: actions/checkout@v3
121121
- run: ./.github/scripts/install_dependencies.sh
122122

@@ -126,12 +126,12 @@ jobs:
126126

127127
UniTests:
128128
name: 'U: C++ Unit Tests'
129-
runs-on: ubuntu-18.04
129+
runs-on: ubuntu-22.04
130130
steps:
131131

132132
- uses: actions/setup-python@v4
133133
with:
134-
python-version: 3.6
134+
python-version: 3.10.10
135135
- uses: actions/checkout@v3
136136
- run: ./.github/scripts/install_dependencies.sh
137137

@@ -143,12 +143,12 @@ jobs:
143143

144144
Warnings:
145145
name: 'W: Check Compilation Warnings'
146-
runs-on: ubuntu-18.04
146+
runs-on: ubuntu-22.04
147147
steps:
148148

149149
- uses: actions/setup-python@v4
150150
with:
151-
python-version: 3.6
151+
python-version: 3.10.10
152152
- uses: actions/checkout@v3
153153
- run: ./.github/scripts/install_dependencies.sh
154154

@@ -165,7 +165,7 @@ jobs:
165165
166166
167167
Regression:
168-
runs-on: ubuntu-18.04
168+
runs-on: ubuntu-22.04
169169
strategy:
170170
fail-fast: false
171171
matrix:
@@ -216,7 +216,7 @@ jobs:
216216

217217
- uses: actions/setup-python@v4
218218
with:
219-
python-version: 3.6
219+
python-version: 3.10.10
220220
- uses: actions/checkout@v3
221221
- run: ./.github/scripts/install_dependencies.sh
222222

@@ -250,7 +250,7 @@ jobs:
250250
vtr_flow/**/parse_results*.txt
251251
252252
Sanitized:
253-
runs-on: ubuntu-18.04
253+
runs-on: ubuntu-22.04
254254
strategy:
255255
fail-fast: false
256256
matrix:
@@ -269,7 +269,7 @@ jobs:
269269

270270
- uses: actions/setup-python@v4
271271
with:
272-
python-version: 3.6
272+
python-version: 3.10.10
273273
- uses: actions/checkout@v3
274274
- run: ./.github/scripts/install_dependencies.sh
275275

@@ -289,12 +289,12 @@ jobs:
289289
290290
Parmys:
291291
name: 'Parmys Basic Test'
292-
runs-on: ubuntu-18.04
292+
runs-on: ubuntu-22.04
293293
steps:
294294

295295
- uses: actions/setup-python@v4
296296
with:
297-
python-version: 3.6
297+
python-version: 3.10.10
298298
- uses: actions/checkout@v3
299299
- run: ./.github/scripts/install_dependencies.sh
300300

@@ -312,12 +312,12 @@ jobs:
312312
313313
ODINII:
314314
name: 'ODIN-II Basic Test'
315-
runs-on: ubuntu-18.04
315+
runs-on: ubuntu-22.04
316316
steps:
317317

318318
- uses: actions/setup-python@v4
319319
with:
320-
python-version: 3.6
320+
python-version: 3.10.10
321321
- uses: actions/checkout@v3
322322
- run: ./.github/scripts/install_dependencies.sh
323323

@@ -335,12 +335,12 @@ jobs:
335335
336336
VQM2BLIF:
337337
name: 'VQM2BLIF Basic Tests'
338-
runs-on: ubuntu-18.04
338+
runs-on: ubuntu-22.04
339339
steps:
340340

341341
- uses: actions/setup-python@v4
342342
with:
343-
python-version: 3.6
343+
python-version: 3.10.10
344344
- uses: actions/checkout@v3
345345
- run: ./.github/scripts/install_dependencies.sh
346346

@@ -355,25 +355,21 @@ jobs:
355355
./utils/vqm2blif/test/scripts/test_vqm2blif.sh
356356
357357
Compatibility:
358-
runs-on: ubuntu-18.04
358+
runs-on: ubuntu-22.04
359359
strategy:
360360
fail-fast: false
361361
matrix:
362362
include:
363-
- { name: 'GCC 7 (Ubuntu Bionic - 18.04)', eval: 'CC=gcc-7 && CXX=g++-7', }
364-
- { name: 'GCC 8 (Debian Buster)', eval: 'CC=gcc-8 && CXX=g++-8', }
365-
- { name: 'GCC 9 (Ubuntu Focal - 20.04)', eval: 'CC=gcc-9 && CXX=g++-9', }
366-
- { name: 'GCC 10 (Ubuntu Hirsute - 21.04)', eval: 'CC=gcc-10 && CXX=g++-10', }
367-
- { name: 'GCC 11 (Latest)', eval: 'CC=gcc-11 && CXX=g++-11', }
368-
- { name: 'Clang 6 (Ubuntu Bionic - 18.04)', eval: 'CC=clang-6.0 && CXX=clang++-6.0', }
369-
- { name: 'Clang 7 (Debian Buster)', eval: 'CC=clang-7 && CXX=clang++-7', }
370-
- { name: 'Clang 10 (Ubuntu Focal - 20.04)', eval: 'CC=clang-10 && CXX=clang++-10', }
363+
- { name: 'GCC 9 (Ubuntu Jammy - 22.04)', eval: 'CC=gcc-9 && CXX=g++-9', }
364+
- { name: 'GCC 10 (Ubuntu Jammy - 22.04)', eval: 'CC=gcc-10 && CXX=g++-10', }
365+
- { name: 'GCC 11 (Ubuntu Jammy - 22.04)', eval: 'CC=gcc-11 && CXX=g++-11', }
366+
- { name: 'Clang 12 (Ubuntu Jammy - 22.04)', eval: 'CC=clang-12 && CXX=clang++-12', }
371367
name: 'B: ${{ matrix.name }}'
372368
steps:
373369

374370
- uses: actions/setup-python@v4
375371
with:
376-
python-version: 3.6
372+
python-version: 3.10.10
377373
- uses: actions/checkout@v3
378374
- run: ./.github/scripts/install_dependencies.sh
379375

@@ -402,12 +398,12 @@ jobs:
402398
- ODINII
403399
- VQM2BLIF
404400
- Compatibility
405-
runs-on: ubuntu-18.04
401+
runs-on: ubuntu-22.04
406402
steps:
407403

408404
- uses: actions/setup-python@v4
409405
with:
410-
python-version: 3.6
406+
python-version: 3.10.10
411407
- uses: actions/checkout@v3
412408
- run: ./.github/scripts/install_dependencies.sh
413409

‎cmake/modules/AutoClangFormat.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ add_custom_target(format-cpp-files
2121
COMMAND find ${DIRS_TO_FORMAT_CPP} ${FIND_TO_FORMAT_CPP})
2222

2323
#
24-
# Use clang-format-7 for code format
24+
# Use clang-format-12 for code format
2525
#
2626
add_custom_target(format-cpp
2727
COMMAND find ${DIRS_TO_FORMAT_CPP} ${FIND_TO_FORMAT_CPP} |
28-
xargs -P ${CPU_COUNT} clang-format-7 -style=file -i)
28+
xargs -P ${CPU_COUNT} clang-format-12 -style=file -i)
2929

3030
#
3131
# Use simple python script for fixing C like boxed comments

‎libs/libvtrutil/src/vtr_vector.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#include <vector>
44
#include <cstddef>
55
#include <iterator>
6+
#include <algorithm>
67
#include "vtr_range.h"
78

89
namespace vtr {

0 commit comments

Comments
 (0)