Favor rustc to get rust version

Signed-off-by: Lim, Kian-An <[email protected]>

Author: LimKianAn

.github/workflows/release.yml

@@ -17,7 +17,7 @@ jobs:
 
       - name: Set env vars
         run: |
-          source ci/rust-version.sh
+          rust_stable=$(rustc --version | awk '{print $2}')
           echo "RUST_STABLE=$rust_stable" | tee -a $GITHUB_ENV
 
       - if: runner.os == 'Linux'

.github/workflows/test.yml

@@ -16,7 +16,7 @@ jobs:
 
       - name: Set env vars
         run: |
-          source ci/rust-version.sh
+          rust_stable=$(rustc --version | awk '{print $2}')
           echo "RUST_STABLE=$rust_stable" | tee -a $GITHUB_ENV
 
       - if: runner.os == 'Linux'

ci/cargo-build-test.sh

@@ -6,14 +6,13 @@
 set -e
 cd "$(dirname "$0")/.."
 
-source ./ci/rust-version.sh stable
-
 export RUSTFLAGS="-D warnings"
 export RUSTBACKTRACE=1
 
 set -x
 
 # Build/test all host crates
+rust_stable=$(rustc --version | awk '{print $2}')
 cargo +"$rust_stable" build
 cargo +"$rust_stable" test -- --nocapture
 

ci/create-tarball.sh

@@ -40,7 +40,6 @@ echo --- Creating release tarball
   # Make CHANNEL available to include in the software version information
   export CHANNEL
 
-  source ci/rust-version.sh stable
   ci/cargo-install-all.sh stable "${RELEASE_BASENAME}"
 
   tar cvf "${TARBALL_BASENAME}"-$TARGET.tar "${RELEASE_BASENAME}"

ci/rust-version.sh

@@ -1 +1,2 @@
-1.60.0
+[toolchain]
+channel = "1.60.0"