Remove override for rustup version

The override feature for the rustup version has been removed, since the
version seems to be hardcoded in the binary as well. So it was possible
to change the path where the artifacts were stored in S3, but using the
version to verify that rustup got updated wasn't possible.

Author: jdno

.github/workflows/ci.yml

@@ -65,9 +65,6 @@ jobs:
     name: Local rustup
     runs-on: ubuntu-latest
 
-    env:
-      RUSTUP_OVERRIDE_VERSION: 99.0.0
-
     strategy:
       fail-fast: false
       matrix:
@@ -80,6 +77,9 @@ jobs:
       - name: Ensure Rust Stable is up to date
         run: rustup self update && rustup update stable
 
+      - name: Get the current rustup version
+        run: echo "PREVIOUS_RUSTUP_VERSION=$(rustup --version | cut -d ' ' -f 2)" >> $GITHUB_ENV
+
       - name: Start the local environment
         run: docker compose up -d
 
@@ -91,8 +91,18 @@ jobs:
         env:
           RUSTUP_UPDATE_ROOT: http://localhost:9000/static/rustup
 
+      - name: Get the new rustup version
+        run: echo "NEW_RUSTUP_VERSION=$(rustup --version | cut -d ' ' -f 2)" >> $GITHUB_ENV
+
       - name: Verify Rustup version
-        run: rustup --version | grep -q ${{ env.RUSTUP_OVERRIDE_VERSION }}
+        run: |
+          if [[ "${PREVIOUS_RUSTUP_VERSION}" == "${NEW_RUSTUP_VERSION}" ]]; then
+            echo "Rustup version did not change"
+            exit 1
+          else
+            echo "Previous Rustup version: ${PREVIOUS_RUSTUP_VERSION}"
+            echo "New Rustup version: ${NEW_RUSTUP_VERSION}"
+          fi
 
   docker:
     name: Build Docker image

local/rustup.sh

@@ -107,10 +107,5 @@ 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,8 +5,6 @@
 set -euo pipefail
 IFS=$'\n\t'
 
-RUSTUP_OVERRIDE_VERSION="${RUSTUP_OVERRIDE_VERSION:-}"
-
 if [[ "$#" -lt 1 ]]; then
   echo "Usage: $0 <release|rustup>"
   exit 1
@@ -50,11 +48,5 @@ if [[ "$(uname)" == "Linux" ]]; then
     cargo build --release
 fi
 
-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}"

src/rustup.rs

@@ -61,7 +61,7 @@ impl Context {
         let head_sha = self.get_commit_sha_for_rustup_release()?;
 
         // The commit on the `stable` branch is used to determine the version number
-        let version = self.get_next_rustup_version(&head_sha)?;
+        let version = self.get_next_rustup_version_from_github(&head_sha)?;
 
         // Download the Rustup artifacts from S3
         let dist_dir = self.download_rustup_artifacts(&head_sha)?;
@@ -115,16 +115,6 @@ impl Context {
         Ok(commit.sha)
     }
 
-    fn get_next_rustup_version(&self, sha: &str) -> anyhow::Result<String> {
-        // Allow the version to be overridden manually, for example to test the release process
-        if let Ok(version) = std::env::var("PROMOTE_RELEASE_RUSTUP_OVERRIDE_VERSION") {
-            println!("Using override version: {}", version);
-            Ok(version)
-        } else {
-            self.get_next_rustup_version_from_github(sha)
-        }
-    }
-
     fn get_next_rustup_version_from_github(&self, sha: &str) -> anyhow::Result<String> {
         println!("Getting next Rustup version from Cargo.toml...");