Fix overriding the Rustup version

Author: jdno

.github/workflows/ci.yml

@@ -4,7 +4,7 @@ on:
   push:
     branches:
       - master
-  pull_request: {}
+  pull_request: { }
 
 jobs:
   test:
@@ -35,7 +35,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        channel: [stable, beta, nightly]
+        channel: [ stable, beta, nightly ]
 
     steps:
       - name: Clone the source code
@@ -66,12 +66,12 @@ jobs:
     runs-on: ubuntu-latest
 
     env:
-      PROMOTE_RELEASE_RUSTUP_OVERRIDE_VERSION: 99.0.0
+      RUSTUP_OVERRIDE_VERSION: 99.0.0
 
     strategy:
       fail-fast: false
       matrix:
-        channel: [stable, beta]
+        channel: [ stable, beta ]
 
     steps:
       - name: Clone the source code
@@ -91,6 +91,9 @@ jobs:
         env:
           RUSTUP_UPDATE_ROOT: http://localhost:9000/static/rustup
 
+      - name: Verify Rustup version
+        run: rustup --version | grep -q ${{ env.RUSTUP_OVERRIDE_VERSION }}
+
   docker:
     name: Build Docker image
     runs-on: ubuntu-latest
@@ -120,7 +123,7 @@ jobs:
     permissions:
       id-token: write
 
-    needs: [test, release, rustup, docker]
+    needs: [ test, release, rustup, docker ]
     if: github.event_name == 'push' && github.repository == 'rust-lang/promote-release' && github.ref == 'refs/heads/master'
 
     steps:

local/rustup.sh

@@ -42,8 +42,8 @@ else
 fi
 
 for target in "${DOWNLOAD_TARGETS[@]}"; do
-    if ! mc stat "local/artifacts/builds/${commit}/dist/${target}" >/dev/null 2>&1; then
-        echo "==> copying ${target} from S3"
+  if ! mc stat "local/artifacts/builds/${commit}/dist/${target}" >/dev/null 2>&1; then
+    echo "==> copying ${target} from S3"
 
         for file in "${DOWNLOAD_FILES[@]}"; do
             if curl -Lo /tmp/component "${DOWNLOAD_BASE}/${commit}/dist/${target}/${file}" --fail; then
@@ -94,5 +94,10 @@ if [[ "${override_commit}" != "" ]]; then
    export PROMOTE_RELEASE_OVERRIDE_COMMIT="${override_commit}"
 fi
 
+# Conditionally set a version for the next Rustup release
+if [[ "${RUSTUP_OVERRIDE_VERSION:-}" != "" ]]; then
+  export PROMOTE_RELEASE_RUSTUP_OVERRIDE_VERSION="${RUSTUP_OVERRIDE_VERSION}"
+fi
+
 echo "==> starting promote-release"
 /src/target/release/promote-release /persistent/release "${channel}"

run.sh

@@ -5,7 +5,7 @@
 set -euo pipefail
 IFS=$'\n\t'
 
-PROMOTE_RELEASE_RUSTUP_OVERRIDE_VERSION=""
+RUSTUP_OVERRIDE_VERSION="${RUSTUP_OVERRIDE_VERSION:-}"
 
 if [[ "$#" -lt 1 ]]; then
   echo "Usage: $0 <release|rustup>"
@@ -50,11 +50,11 @@ if [[ "$(uname)" == "Linux" ]]; then
     cargo build --release
 fi
 
-# If the PROMOTE_RELEASE_RUSTUP_OVERRIDE_VERSION environment variable is set,
-# forward it to the Docker environment.
-if [[ "$PROMOTE_RELEASE_RUSTUP_OVERRIDE_VERSION" != "" ]]; then
-  docker compose exec -e "PROMOTE_RELEASE_RUSTUP_OVERRIDE_VERSION=${PROMOTE_RELEASE_RUSTUP_OVERRIDE_VERSION}" -T local "/src/local/${command}.sh" "${channel}" "${override_commit}"
+if [[ "$RUSTUP_OVERRIDE_VERSION" != "" ]]; then
+  # If the RUSTUP_OVERRIDE_VERSION environment variable is set, forward it to the Docker environment.
+  echo "==> running local release with override version ${RUSTUP_OVERRIDE_VERSION}"
+  docker compose exec -e "RUSTUP_OVERRIDE_VERSION=${RUSTUP_OVERRIDE_VERSION}" -T local "/src/local/${command}.sh" "${channel}" "${override_commit}"
+else
+  # Run the command inside the docker environment.
+  docker compose exec -T local "/src/local/${command}.sh" "${channel}" "${override_commit}"
 fi
-
-# Run the command inside the docker environment.
-docker compose exec -T local "/src/local/${command}.sh" "${channel}" "${override_commit}"