Skip to content

Commit ac856fe

Browse files
committed
merge: merge branch 9.x_alpha into master
Change-Id: I6013485c51b6ed314529e68d63a3c7759762bb70
2 parents f8f1e10 + 03e6ddd commit ac856fe

8,721 files changed

Lines changed: 661942 additions & 510643 deletions

File tree

Some content is hidden

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

.bazelrc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,7 @@
22
# as recommended in https://github.com/bazelbuild/bazel/issues/6319
33
try-import %workspace%/tools/bazel.rc
44
try-import %workspace%/.apollo.bazelrc
5+
6+
try-import %workspace%/.custom.bazelrc
7+
8+
# build --remote_cache="http://localhost:8080/

.clang-format

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@ IncludeCategories:
1010
# Note that the "main" header is priority 0
1111
# The priority is assigned to first match in the ordered list
1212
# Miscelaneous system libraries
13-
- Regex: '<(immintrin.h|malloc.h|wait.h|x86intrin.h|cuda.*)>'
13+
- Regex: '<(cxxabi.h|immintrin.h|malloc.h|wait.h|x86intrin.h|cuda.*)>'
14+
Priority: 3
15+
# third-party libraries
16+
- Regex: '<(tinyxml2.h)>'
1417
Priority: 3
1518
# C standard libraries
1619
- Regex: '<(arpa/|netinet/|net/if|sys/)?[^\./]*\.h>'

.dockerignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
/.cache
2+
/bazel-apollo
3+
/bazel-bin
4+
/bazel-out
5+
/bazel-testlogs

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,4 +81,7 @@ tools/FlameGraph
8181
# jetbrain profiler
8282
.DS_Store
8383

84+
# dv plugins
85+
modules/studio_connector
86+
8487
#WORKSPACE

.teamcity/run_ci.sh

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ DEV_INSIDE="in-dev-docker"
2525
HOST_ARCH="$(uname -m)"
2626
TARGET_ARCH="$(uname -m)"
2727
DOCKER_RUN="docker run"
28-
FAST_MODE="no"
28+
FAST_MODE="y"
2929
USE_GPU_HOST=0
3030
VOLUME_VERSION="latest"
3131
MAP_VOLUME_CONF=
@@ -39,29 +39,31 @@ DEFAULT_MAPS=(
3939
)
4040

4141
DEFAULT_TEST_MAPS=(
42-
sunnyvale_big_loop
4342
sunnyvale_loop
4443
)
4544

4645
eval $(grep ^VERSION_X86_64= ${APOLLO_ROOT_DIR}/docker/scripts/dev_start.sh)
4746
eval $(grep ^VERSION_AARCH64= ${APOLLO_ROOT_DIR}/docker/scripts/dev_start.sh)
4847

4948
function parse_arguments() {
49+
local fast_mode=""
5050
while [ $# -gt 0 ]; do
5151
local opt="$1"
5252
shift
5353
case "${opt}" in
5454
-f | --fast)
55-
FAST_MODE="yes"
55+
fast_mode="$1"
56+
shift
57+
optarg_check_for_opt "${opt}" "${fast_mode}"
5658
;;
57-
5859
*)
5960
warning "Unknown option: ${opt}"
6061
exit 2
6162
;;
6263
esac
6364
done # End while loop
6465

66+
[[ -n "${fast_mode}" ]] && FAST_MODE="${fast_mode}"
6567
}
6668

6769
function determine_dev_image() {
@@ -196,7 +198,7 @@ function start_map_volume() {
196198

197199
function mount_map_volumes() {
198200
info "Starting mounting map volumes ..."
199-
if [ "$FAST_MODE" = "no" ]; then
201+
if [ "$FAST_MODE" == "n" ] || [ "$FAST_MODE" == "no" ]; then
200202
for map_name in ${DEFAULT_MAPS[@]}; do
201203
start_map_volume "${map_name}" "${VOLUME_VERSION}"
202204
done

0 commit comments

Comments
 (0)