Skip to content

Commit 8abb552

Browse files
authored
Merge branch 'master' into macos
2 parents 4891317 + f6ded92 commit 8abb552

File tree

8 files changed

+84
-110
lines changed

8 files changed

+84
-110
lines changed

.github/scripts/install_dependencies.sh

Lines changed: 8 additions & 9 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 \
@@ -44,18 +43,18 @@ sudo apt install -y \
4443
qtbase5-dev \
4544
uuid-dev \
4645
default-jdk \
47-
g++-9 \
48-
gcc-9 \
49-
g++-10 \
50-
gcc-10 \
5146
g++-11 \
5247
gcc-11 \
5348
g++-12 \
5449
gcc-12 \
55-
clang-11 \
56-
clang-12 \
57-
clang-13 \
58-
clang-14 \
50+
g++-13 \
51+
gcc-13 \
52+
g++-14 \
53+
gcc-14 \
54+
clang-15 \
55+
clang-16 \
56+
clang-17 \
57+
clang-18 \
5958
clang-format-14 \
6059
libtbb-dev
6160

.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.

0 commit comments

Comments
 (0)