File tree 1 file changed +12
-3
lines changed
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`"
36
36
objdir=$root_dir /obj
37
37
dist=$objdir /build/dist
38
38
39
+
40
+ if [ -d " $root_dir /.git" ]; then
41
+ IS_GIT_SOURCE=1
42
+ fi
43
+
39
44
source " $ci_dir /shared.sh"
40
45
41
46
CACHE_DOMAIN=" ${CACHE_DOMAIN:- ci-caches.rust-lang.org} "
@@ -249,9 +254,13 @@ if [ "$dev" = "1" ]
249
254
then
250
255
# Interactive + TTY
251
256
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
253
262
else
254
- command=" /checkout/src/ci/run.sh"
263
+ command=( /checkout/src/ci/run.sh)
255
264
fi
256
265
257
266
if [ " $CI " != " " ]; then
@@ -301,7 +310,7 @@ docker \
301
310
--init \
302
311
--rm \
303
312
rust-ci \
304
- $ command
313
+ " ${ command[@]} "
305
314
306
315
cat $objdir /${SUMMARY_FILE} >> " ${GITHUB_STEP_SUMMARY} "
307
316
You can’t perform that action at this time.
0 commit comments