nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-04-17 06:26:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #119165 - onur-ozkan:update-container-entrypoint, r=Kobzol

Browse Source 
improve container runner script

First commit fixes #118930

Second commit is mostly for development purposes. In read-only mode submodules cannot be initialized due to access limitations (see the log below), which means that tools cannot be built.

```sh
Updating submodule src/tools/cargo
error: could not lock config file .git/config: Read-only file system
error: could not lock config file .git/config: Read-only file system
fatal: Failed to register url for submodule path 'src/tools/cargo'
error: could not lock config file .git/config: Read-only file system
error: could not lock config file .git/config: Read-only file system
fatal: Failed to register url for submodule path 'src/tools/cargo'
Build completed unsuccessfully in 0:00:00

```
This commit is contained in:
Matthias Krüger 2023-12-24 01:08:08 +01:00 committed by GitHub
commit 09131a2e31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/ci/docker/run.sh
View File

@ -36,6 +36,11 @@ root_dir="`dirname $src_dir`"
objdir=$root_dir/obj
dist=$objdir/build/dist
if [ -d "$root_dir/.git" ]; then
IS_GIT_SOURCE=1
fi
source "$ci_dir/shared.sh"
CACHE_DOMAIN="${CACHE_DOMAIN:-ci-caches.rust-lang.org}"
@ -194,6 +199,14 @@ else
args="$args --env SCCACHE_DIR=/sccache --volume $HOME/.cache/sccache:/sccache"
fi
# By default, container volumes are bound as read-only; therefore doing experimental work
# or debugging within the container environment (such as fetching submodules and
# building them) is not possible. Setting READ_ONLY_SRC to 0 enables this capability by
# binding the volumes in read-write mode.
if [ "$READ_ONLY_SRC" != "0" ]; then
SRC_MOUNT_OPTION=":ro"
fi
# Run containers as privileged as it should give them access to some more
# syscalls such as ptrace and whatnot. In the upgrade to LLVM 5.0 it was
# discovered that the leak sanitizer apparently needs these syscalls nowadays so
@ -228,7 +241,7 @@ if [ -f /.dockerenv ]; then
docker cp . checkout:/checkout
args="$args --volumes-from checkout"
else
args="$args --volume $root_dir:/checkout:ro"
args="$args --volume $root_dir:/checkout$SRC_MOUNT_OPTION"
args="$args --volume $objdir:/checkout/obj"
args="$args --volume $HOME/.cargo:/cargo"
args="$args --volume $HOME/rustsrc:$HOME/rustsrc"
@ -249,9 +262,13 @@ if [ "$dev" = "1" ]
then
# Interactive + TTY
args="$args -it"
command="/bin/bash"
if [ $IS_GIT_SOURCE -eq 1 ]; then
command=(/bin/bash -c 'git config --global --add safe.directory /checkout;bash')
else
command=(/bin/bash)
fi
else
command="/checkout/src/ci/run.sh"
command=(/checkout/src/ci/run.sh)
fi
if [ "$CI" != "" ]; then
@ -301,7 +318,7 @@ docker \
--init \
--rm \
rust-ci \
$command
"${command[@]}"
cat $objdir/${SUMMARY_FILE} >> "${GITHUB_STEP_SUMMARY}"