File tree Expand file tree Collapse file tree 1 file changed +12
-3
lines changed Expand file tree Collapse file tree 1 file changed +12
-3
lines changed Original file line number Diff line number Diff line change @@ -36,6 +36,11 @@ root_dir="`dirname $src_dir`"
3636objdir=$root_dir /obj
3737dist=$objdir /build/dist
3838
39+
40+ if [ -d " $root_dir /.git" ]; then
41+ IS_GIT_SOURCE=1
42+ fi
43+
3944source " $ci_dir /shared.sh"
4045
4146CACHE_DOMAIN=" ${CACHE_DOMAIN:- ci-caches.rust-lang.org} "
@@ -249,9 +254,13 @@ if [ "$dev" = "1" ]
249254then
250255 # Interactive + TTY
251256 args=" $args -it"
252- command=" /bin/bash"
257+ if [ $IS_GIT_SOURCE -eq 1 ]; then
258+ command=(/bin/bash -c ' git config --global --add safe.directory /checkout;bash' )
259+ else
260+ command=(/bin/bash)
261+ fi
253262else
254- command=" /checkout/src/ci/run.sh"
263+ command=( /checkout/src/ci/run.sh)
255264fi
256265
257266if [ " $CI " != " " ]; then
@@ -301,7 +310,7 @@ docker \
301310 --init \
302311 --rm \
303312 rust-ci \
304- $ command
313+ " ${ command[@]} "
305314
306315cat $objdir /${SUMMARY_FILE} >> " ${GITHUB_STEP_SUMMARY} "
307316
You can’t perform that action at this time.
0 commit comments