File tree Expand file tree Collapse file tree 4 files changed +24
-32
lines changed
Expand file tree Collapse file tree 4 files changed +24
-32
lines changed Original file line number Diff line number Diff line change 22
33sudo apt update
44
5+ # Required packages specifically for the CI and not VTR in general.
56sudo apt install -y \
67 autoconf \
78 automake \
89 bash \
9- bison \
1010 binutils \
1111 binutils-gold \
12- build-essential \
1312 capnproto \
1413 exuberant-ctags \
1514 curl \
1615 doxygen \
17- flex \
1816 fontconfig \
1917 gdb \
20- git \
2118 gperf \
2219 libcairo2-dev \
2320 libcapnp-dev \
24- libgtk-3-dev \
2521 libevent-dev \
2622 libfontconfig1-dev \
2723 liblist-moreutils-perl \
2824 libncurses5-dev \
29- libx11-dev \
3025 libxft-dev \
3126 libxml2-utils \
3227 libxml++2.6-dev \
33- libreadline-dev \
3428 tcllib \
3529 tcl8.6-dev \
36- libffi-dev \
3730 perl \
38- pkg-config \
3931 texinfo \
4032 time \
4133 valgrind \
@@ -54,9 +46,10 @@ sudo apt install -y \
5446 clang-15 \
5547 clang-16 \
5648 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
6053
6154pip install -r requirements.txt
6255
Original file line number Diff line number Diff line change 22
33sudo apt update
44
5+ # Required packages specifically for the CI and not VTR in general.
56sudo apt install -y \
67 autoconf \
78 automake \
89 bash \
9- bison \
1010 binutils \
1111 binutils-gold \
12- build-essential \
1312 capnproto \
1413 exuberant-ctags \
1514 curl \
1615 doxygen \
17- flex \
1816 fontconfig \
1917 gdb \
20- git \
2118 gperf \
2219 libcairo2-dev \
2320 libcapnp-dev \
24- libgtk-3-dev \
2521 libevent-dev \
2622 libfontconfig1-dev \
2723 liblist-moreutils-perl \
2824 libncurses5-dev \
29- libx11-dev \
3025 libxft-dev \
3126 libxml2-utils \
3227 libxml++2.6-dev \
33- libreadline-dev \
3428 tcllib \
3529 tcl8.6-dev \
36- libffi-dev \
3730 perl \
38- pkg-config \
3931 texinfo \
4032 time \
4133 valgrind \
@@ -50,9 +42,10 @@ sudo apt install -y \
5042 g++-11 \
5143 gcc-11 \
5244 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
5649
5750pip install -r requirements.txt
5851
Original file line number Diff line number Diff line change @@ -11,18 +11,15 @@ ENV PIP_BREAK_SYSTEM_PACKAGES=1
1111# Install and cleanup is done in one command to minimize the build cache size
1212RUN apt-get update -qq \
1313# 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 ' \
1515# Install packages
1616 | xargs apt-get -y install --no-install-recommends \
1717# Additional packages not listed in install_apt_packages.sh
1818 && apt-get -y install --no-install-recommends \
1919 wget \
2020 ninja-build \
21- default-jre \
2221 libeigen3-dev \
23- libtbb-dev \
2422 python3-pip \
25- git \
2623 time \
2724# Install python packages
2825 && pip install -r requirements.txt \
Original file line number Diff line number Diff line change @@ -10,7 +10,11 @@ sudo apt-get install -y \
1010 flex \
1111 python3-dev \
1212 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+
1418# Required for graphics
1519sudo apt-get install -y \
1620 libgtk-3-dev \
@@ -42,6 +46,11 @@ sudo apt-get install -y \
4246 sphinx-common
4347
4448# 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