builder: pass RUST_VERSION extracted from rust-toolchain.toml

Author: Wenzel

.github/builder/common.sh

@@ -5,7 +5,7 @@
 
 set -e
 
-if [ -z "${RUST_NIGHTLY_DATE}"  ]; then
+if [ -z "${RUST_VERSION}"  ]; then
     echo "RUST_NIGHTLY_DATE not set. It should be defined by ci.yml workflow."
     exit 1
 fi
@@ -112,8 +112,8 @@ download_and_verify_make() {
 
 download_and_verify_rust() {
     RUST_GPG_KEY_URL="https://static.rust-lang.org/rust-key.gpg.ascii"
-    RUST_URL="https://static.rust-lang.org/dist/${RUST_NIGHTLY_DATE}/rust-nightly-x86_64-unknown-linux-gnu.tar.xz"
-    RUST_SIG_URL="https://static.rust-lang.org/dist/${RUST_NIGHTLY_DATE}/rust-nightly-x86_64-unknown-linux-gnu.tar.xz.asc"
+    RUST_URL="https://static.rust-lang.org/dist/rust-${RUST_VERSION}-x86_64-unknown-linux-gnu.tar.gz"
+    RUST_SIG_URL="https://static.rust-lang.org/dist/rust-${RUST_VERSION}-x86_64-unknown-linux-gnu.tar.gz.asc"
 
     if [ -z "${BUILDER_DIR}" ]; then
         echo "BUILDER_DIR not set. Exiting..."

.github/workflows/ci.yml

@@ -665,17 +665,16 @@ jobs:
           with open('rust-toolchain.toml', 'rb') as f:
               data = tomllib.load(f)
               channel = data['toolchain']['channel']
-              date = channel.split("nightly-")[1]
 
           with open(os.environ['GITHUB_OUTPUT'], 'a') as out:
-              out.write(f'nightly_date={date}\n')
+              out.write(f'rust_version={channel}\n')
 
       # NOTE: This script only downloads the builder dependencies if they do not already exist,
       # but it always verifies them.
       - name: Build Distribution Package
         run: |
-          RUST_NIGHTLY_DATE="${{ steps.rust-channel.outputs.nightly_date }}"
-          export RUST_NIGHTLY_DATE
+          RUST_VERSION="${{ steps.rust-channel.outputs.rust_version }}"
+          export RUST_VERSION
           ./scripts/build.sh
 
       - name: Upload Distribution Package