about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-06-15 16:38:08 +0000
committerbors <bors@rust-lang.org>2018-06-15 16:38:08 +0000
commit24edc416ab3944b680fc73057879da7fa1d50c22 (patch)
treec359749ccf7b76cd6b0a33d5fb69e4647861929f
parent5205ae8bdc2991eecf3bfbb58ed8f56c0673e738 (diff)
parent770e45c9c988a2b16be7760efa0ef996fd29d1df (diff)
downloadrust-24edc416ab3944b680fc73057879da7fa1d50c22.tar.gz
rust-24edc416ab3944b680fc73057879da7fa1d50c22.zip
Auto merge of #51565 - kennytm:fix-toolstate-on-appveyor, r=Mark-Simulacrum
Fix the recent spurious breakage on AppVeyor.

Fixed the spurious error introduced by d2b5b7603b6b7ecb4ff93981c785aef640015e68 due to a wrongly resolved relative path on AppVeyor.

This only starts to happen today because we just entered the last week of the 6-week cycle.
-rwxr-xr-xsrc/ci/docker/x86_64-gnu-tools/checktools.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ci/docker/x86_64-gnu-tools/checktools.sh b/src/ci/docker/x86_64-gnu-tools/checktools.sh
index d26be93861c..56e637249f5 100755
--- a/src/ci/docker/x86_64-gnu-tools/checktools.sh
+++ b/src/ci/docker/x86_64-gnu-tools/checktools.sh
@@ -91,7 +91,7 @@ status_check() {
 
 status_check "submodule_changed"
 
-CHECK_NOT="$(dirname $0)/checkregression.py"
+CHECK_NOT="$(readlink -f "$(dirname $0)/checkregression.py")"
 change_toolstate() {
     # only update the history
     if python2.7 "$CHECK_NOT" "$OS" "$TOOLSTATE_FILE" "_data/latest.json" changed; then