]> git.lizzy.rs Git - rust.git/commitdiff
ci: gate toolstate repo pushes on the TOOLSTATE_PUBLISH envvar
authorPietro Albini <pietro@pietroalbini.org>
Thu, 25 Jul 2019 09:51:08 +0000 (11:51 +0200)
committerPietro Albini <pietro@pietroalbini.org>
Thu, 25 Jul 2019 09:51:08 +0000 (11:51 +0200)
Unfortunately due to an Azure quirk the TOOLSTATE_REPO_ACCESS_TOKEN is
not suitable to gate whether to push new commits to the repo, as if it's
not defined on the Azure side it will actually be set to the literal
`$(TOOLSTATE_REPO_ACCESS_TOKEN)`, which screws everything up.

This instead adds another, non-secret environment variable to gate
publishing: TOOLSTATE_PUBLISH. As non-secret environment variables
behave correctly this fixes the issue.

src/ci/docker/x86_64-gnu-tools/checktools.sh

index 9995d2aac7f243edc2fc2b5631544f06b53f66f5..2191d5d6e4680ce443cdae19d4bdbbccf3d1e1d3 100755 (executable)
@@ -112,7 +112,7 @@ $COMMIT\t$(cat "$TOOLSTATE_FILE")
 }
 
 if [ "$RUST_RELEASE_CHANNEL" = nightly ]; then
-    if [ -n "${TOOLSTATE_REPO_ACCESS_TOKEN+is_set}" ]; then
+    if [ -n "${TOOLSTATE_PUBLISH+is_set}" ]; then
         . "$(dirname $0)/repo.sh"
         MESSAGE_FILE=$(mktemp -t msg.XXXXXX)
         echo "($OS CI update)" > "$MESSAGE_FILE"