ci: Update images but pin Rust nightly due to broken lints

See: - rust-lang/rust#121362 - rust-lang/rust#121312 - rust-lang/rust#120770 Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/928>
GNOME · Feb 23, 2024 · b6fa48d · b6fa48d
1 parent c3179b1
commit b6fa48d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -151,7 +151,7 @@ cargo test - opensuse@x86_64:
         # job in the check stage
         # - "${RUST_STABLE}"
         - "${RUST_MINIMUM}"
-        - "nightly"
+        - "${RUST_NIGHTLY}"
 
 cargo test - opensuse@aarch64:
   extends:
@@ -228,7 +228,7 @@ cargo test - gnomeos.nightly.@x86_64:
       - RUST_VERSION:
         - "${RUST_STABLE}"
         - "${RUST_MINIMUM}"
-        - "nightly"
+        - "${RUST_NIGHTLY}"
 
 cargo test - gnomeos.45@x86_64:
   extends:
@@ -245,7 +245,7 @@ cargo test - gnomeos.45@x86_64:
       - RUST_VERSION:
         - "${RUST_STABLE}"
         - "${RUST_MINIMUM}"
-        - "nightly"
+        - "${RUST_NIGHTLY}"
 
 fmt:
   extends:

diff --git a/ci/container_builds.yml b/ci/container_builds.yml
@@ -5,9 +5,10 @@ include:
 variables:
   # When branching change the suffix to avoid conflicts with images
   # from the main branch
-  BASE_TAG: "2024-01-21.0-main"
+  BASE_TAG: "2024-02-22.2-main"
   RUST_STABLE: "1.75.0"
   RUST_MINIMUM: "1.70.0"
+  RUST_NIGHTLY: "nightly-2024-02-01"
   RUSTUP_VERSION: "1.26.0"
 
 # This bunch of packages are the system's C/C++ compilers, and the indirect dependencies needed
@@ -70,7 +71,7 @@ variables:
       bash ci/install-rust.sh --rustup-version ${RUSTUP_VERSION} \
                               --stable ${RUST_STABLE} \
                               --minimum ${RUST_MINIMUM} \
-                              --nightly \
+                              --nightly ${RUST_NIGHTLY} \
                               --arch x86_64-unknown-linux-gnu &&
       bash ci/install-rust-tools.sh &&
       bash ci/install-grcov.sh &&
@@ -116,7 +117,7 @@ opensuse-container@aarch64:
       bash ci/install-rust.sh --rustup-version ${RUSTUP_VERSION} \
                               --stable ${RUST_STABLE} \
                               --minimum ${RUST_MINIMUM} \
-                              --nightly \
+                              --nightly ${RUST_NIGHTLY} \
                               --arch x86_64-unknown-linux-gnu &&
       bash ci/install-rust-tools.sh &&
       bash ci/install-grcov.sh &&

diff --git a/ci/install-rust.sh b/ci/install-rust.sh
@@ -6,7 +6,7 @@ source ./ci/env.sh
 
 export CARGO_HOME='/usr/local/cargo'
 
-PARSED=$(getopt --options '' --longoptions 'rustup-version:,stable:,minimum:,nightly,arch:' --name "$0" -- "$@")
+PARSED=$(getopt --options '' --longoptions 'rustup-version:,stable:,minimum:,nightly:,arch:' --name "$0" -- "$@")
 if [ $? -ne 0 ]; then
 	echo 'Terminating...' >&2
 	exit 1
@@ -39,8 +39,8 @@ while true; do
             ;;
 
         '--nightly')
-            NIGHTLY=1
-            shift 1
+            NIGHTLY=$2
+            shift 2
             ;;
 
         '--arch')
@@ -88,5 +88,5 @@ if [ -n "$MINIMUM" ]; then
 fi
 
 if [ -n "$NIGHTLY" ]; then
-    rustup toolchain install nightly
+    rustup toolchain install $NIGHTLY
 fi