Skip to content

Commit 7c21e04

Browse files
committed
Merge remote-tracking branch 'upstream/master' into fix_short_warn
2 parents ba95e7c + 3f60382 commit 7c21e04

File tree

690 files changed

+188741
-24143
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

690 files changed

+188741
-24143
lines changed

.github/scripts/build.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,13 @@ source $(dirname "$0")/common.sh
66

77
$SPACER
88

9+
if [[ -z "${NUM_PROC}" ]]; then
10+
NUM_PROC=1
11+
fi
12+
913
start_section "vtr.build" "${GREEN}Building..${NC}"
1014
export FAILURE=0
11-
make -k BUILD_TYPE=${BUILD_TYPE} CMAKE_PARAMS="-Werror=dev ${CMAKE_PARAMS} ${CMAKE_INSTALL_PREFIX_PARAMS}" -j2 || export FAILURE=1
15+
make -k BUILD_TYPE=${BUILD_TYPE} CMAKE_PARAMS="-Werror=dev ${CMAKE_PARAMS} ${CMAKE_INSTALL_PREFIX_PARAMS}" -j${NUM_PROC} || export FAILURE=1
1216
end_section "vtr.build"
1317

1418
# When the build fails, produce the failure output in a clear way

.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/scripts/unittest.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ $(dirname "$0")/build.sh
99
$SPACER
1010

1111
start_section "vtr.test.0" "${GREEN}Testing..${NC} ${CYAN}C++ unit tests${NC}"
12-
make test
12+
make test -j${NUM_PROC}
1313
end_section "vtr.test.0"
1414

1515
$SPACER

.github/workflows/nightly_test.yml

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,23 @@ on:
44
# We want to run the CI when anything is pushed to master.
55
# Since master is a protected branch this only happens when a PR is merged.
66
# This is a double check in case the PR was stale and had some issues.
7-
push:
8-
branches:
9-
- master
10-
paths-ignore: # Prevents from running if only docs are updated
11-
- 'doc/**'
12-
- '**/*README*'
13-
- '**.md'
14-
- '**.rst'
15-
pull_request:
16-
paths-ignore: # Prevents from running if only docs are updated
17-
- 'doc/**'
18-
- '**/*README*'
19-
- '**.md'
20-
- '**.rst'
7+
# NOTE: This was turned off in late October 2024 since the Nightly Tests were
8+
# no longer working on the self-hosted runners. Will turn this back on
9+
# once the issue is resolved.
10+
# push:
11+
# branches:
12+
# - master
13+
# paths-ignore: # Prevents from running if only docs are updated
14+
# - 'doc/**'
15+
# - '**/*README*'
16+
# - '**.md'
17+
# - '**.rst'
18+
# pull_request:
19+
# paths-ignore: # Prevents from running if only docs are updated
20+
# - 'doc/**'
21+
# - '**/*README*'
22+
# - '**.md'
23+
# - '**.rst'
2124
workflow_dispatch:
2225
schedule:
2326
- cron: '0 0 * * *' # daily

.github/workflows/noble.yml

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

0 commit comments

Comments
 (0)