diff options
| author | bors <bors@rust-lang.org> | 2022-03-17 18:52:14 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-03-17 18:52:14 +0000 |
| commit | 58f11791af4f97572e7afd83f11cffe04bbbd12f (patch) | |
| tree | c49f2fa96fd0796ab03fbe91e3f22dc19385b77f /src | |
| parent | 461e8078010433ff7de2db2aaae8a3cfb0847215 (diff) | |
| parent | 8322cdb1da257652bf663ae335b190dc129e479f (diff) | |
| download | rust-58f11791af4f97572e7afd83f11cffe04bbbd12f.tar.gz rust-58f11791af4f97572e7afd83f11cffe04bbbd12f.zip | |
Auto merge of #95050 - ehuss:fix-cmake-build, r=Mark-Simulacrum
Fix cmake build. This is an attempt to fix the cmake build. For some reason, it has recently started failing with a permission denied trying to overwrite `/tmp/build.log`. This file exists from the `build-toolchains.sh` step, which is owned by the rustbuild user. I think there is some behavior where a sticky `/tmp` directory doesn't allow overwriting files owned by other users even when running as root. I do not know why this has suddenly started, and I can't reproduce locally with my own docker setup. However, this fix seems to work on CI.
Diffstat (limited to 'src')
| -rwxr-xr-x | src/ci/docker/scripts/cmake.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ci/docker/scripts/cmake.sh b/src/ci/docker/scripts/cmake.sh index 70096173403..f124dbdaa6d 100755 --- a/src/ci/docker/scripts/cmake.sh +++ b/src/ci/docker/scripts/cmake.sh @@ -5,16 +5,16 @@ hide_output() { set +x on_err=" echo ERROR: An error was encountered with the build. -cat /tmp/build.log +cat /tmp/cmake_build.log exit 1 " trap "$on_err" ERR bash -c "while true; do sleep 30; echo \$(date) - building ...; done" & PING_LOOP_PID=$! - "$@" &> /tmp/build.log + "$@" &> /tmp/cmake_build.log trap - ERR kill $PING_LOOP_PID - rm /tmp/build.log + rm /tmp/cmake_build.log set -x } |
