File tree 4 files changed +24
-32
lines changed
4 files changed +24
-32
lines changed Original file line number Diff line number Diff line change 2
2
3
3
sudo apt update
4
4
5
+ # Required packages specifically for the CI and not VTR in general.
5
6
sudo apt install -y \
6
7
autoconf \
7
8
automake \
8
9
bash \
9
- bison \
10
10
binutils \
11
11
binutils-gold \
12
- build-essential \
13
12
capnproto \
14
13
exuberant-ctags \
15
14
curl \
16
15
doxygen \
17
- flex \
18
16
fontconfig \
19
17
gdb \
20
- git \
21
18
gperf \
22
19
libcairo2-dev \
23
20
libcapnp-dev \
24
- libgtk-3-dev \
25
21
libevent-dev \
26
22
libfontconfig1-dev \
27
23
liblist-moreutils-perl \
28
24
libncurses5-dev \
29
- libx11-dev \
30
25
libxft-dev \
31
26
libxml2-utils \
32
27
libxml++2.6-dev \
33
- libreadline-dev \
34
28
tcllib \
35
29
tcl8.6-dev \
36
- libffi-dev \
37
30
perl \
38
- pkg-config \
39
31
texinfo \
40
32
time \
41
33
valgrind \
@@ -54,9 +46,10 @@ sudo apt install -y \
54
46
clang-15 \
55
47
clang-16 \
56
48
clang-17 \
57
- clang-18 \
58
- clang-format-18 \
59
- libtbb-dev
49
+ clang-18
50
+
51
+ # Standard packages install script.
52
+ ./install_apt_packages.sh
60
53
61
54
pip install -r requirements.txt
62
55
Original file line number Diff line number Diff line change 2
2
3
3
sudo apt update
4
4
5
+ # Required packages specifically for the CI and not VTR in general.
5
6
sudo apt install -y \
6
7
autoconf \
7
8
automake \
8
9
bash \
9
- bison \
10
10
binutils \
11
11
binutils-gold \
12
- build-essential \
13
12
capnproto \
14
13
exuberant-ctags \
15
14
curl \
16
15
doxygen \
17
- flex \
18
16
fontconfig \
19
17
gdb \
20
- git \
21
18
gperf \
22
19
libcairo2-dev \
23
20
libcapnp-dev \
24
- libgtk-3-dev \
25
21
libevent-dev \
26
22
libfontconfig1-dev \
27
23
liblist-moreutils-perl \
28
24
libncurses5-dev \
29
- libx11-dev \
30
25
libxft-dev \
31
26
libxml2-utils \
32
27
libxml++2.6-dev \
33
- libreadline-dev \
34
28
tcllib \
35
29
tcl8.6-dev \
36
- libffi-dev \
37
30
perl \
38
- pkg-config \
39
31
texinfo \
40
32
time \
41
33
valgrind \
@@ -50,9 +42,10 @@ sudo apt install -y \
50
42
g++-11 \
51
43
gcc-11 \
52
44
g++-12 \
53
- gcc-12 \
54
- clang-format-14 \
55
- libtbb-dev
45
+ gcc-12
46
+
47
+ # Standard packages install script.
48
+ ./install_apt_packages.sh
56
49
57
50
pip install -r requirements.txt
58
51
Original file line number Diff line number Diff line change @@ -11,18 +11,15 @@ ENV PIP_BREAK_SYSTEM_PACKAGES=1
11
11
# Install and cleanup is done in one command to minimize the build cache size
12
12
RUN apt-get update -qq \
13
13
# Extract package names from install_apt_packages.sh
14
- && sed '/sudo/d' install_apt_packages.sh | sed '/#/d' | sed 's/ \\ //g' | sed '/^$/d' | sed '/^[[:space:]]*$/d' \
14
+ && sed '/sudo/d' install_apt_packages.sh | sed '/#/d' | sed '/if \s .*then$/d' | sed '/else$/d' | sed '/fi$/d' | sed '/echo \s /d' | sed 's/ \\ //g' | sed '/^$/d' | sed '/^[[:space:]]*$/d' | sed 's/ \s //g ' \
15
15
# Install packages
16
16
| xargs apt-get -y install --no-install-recommends \
17
17
# Additional packages not listed in install_apt_packages.sh
18
18
&& apt-get -y install --no-install-recommends \
19
19
wget \
20
20
ninja-build \
21
- default-jre \
22
21
libeigen3-dev \
23
- libtbb-dev \
24
22
python3-pip \
25
- git \
26
23
time \
27
24
# Install python packages
28
25
&& pip install -r requirements.txt \
Original file line number Diff line number Diff line change @@ -10,7 +10,11 @@ sudo apt-get install -y \
10
10
flex \
11
11
python3-dev \
12
12
python3-venv
13
-
13
+
14
+ # Packages for more complex features of VTR that most people will use.
15
+ sudo apt-get install -y \
16
+ libtbb-dev
17
+
14
18
# Required for graphics
15
19
sudo apt-get install -y \
16
20
libgtk-3-dev \
@@ -42,6 +46,11 @@ sudo apt-get install -y \
42
46
sphinx-common
43
47
44
48
# Required for code formatting
45
- sudo apt-get install -y \
46
- clang-format-18
47
-
49
+ # NOTE: clang-format-18 may only be found on specific distributions. Only
50
+ # install it if the distribution has this version of clang format.
51
+ if apt-cache search ' ^clang-format-18$' | grep -q ' clang-format-18' ; then
52
+ sudo apt-get install -y \
53
+ clang-format-18
54
+ else
55
+ echo " clang-format-18 not found in apt-cache. Skipping installation."
56
+ fi
You can’t perform that action at this time.
0 commit comments