From f2982f066ed9fea20660cea92c164c3a9c7124d5 Mon Sep 17 00:00:00 2001 From: Andrew Straw Date: Mon, 16 Dec 2024 17:42:41 +0100 Subject: [PATCH] ci: update to rust 1.82 --- .gitlab-ci.yml | 22 +++++++++++----------- _packaging/setup-ubuntu-20.04.sh | 2 +- _packaging/setup-ubuntu-22.04.sh | 2 +- _packaging/setup-ubuntu-24.04.sh | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 600dca9c6..9870ba38c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -172,7 +172,7 @@ test_flydra2: # cargo run --bin braid-offline-retrack -- -d ..\..\rust-cam-testing-data\20200622_111457.braid -o tmp test_crates_rust_1_80: - image: rust:1.80 + image: rust:1.82 script: - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y llvm-dev libclang-dev clang @@ -294,21 +294,21 @@ test_crates_rust_1_80: - cd ../.. test_crates_rust_nightly: - image: rust:1.80 + image: rust:1.82 script: - export RUSTFLAGS="-D warnings" # Use known good nightly - - rustup update --no-self-update nightly-2024-07-25 + - rustup update --no-self-update nightly-2024-12-14 # Test imops with nightly features - cd imops - - cargo +nightly-2024-07-25 test --no-default-features --features std,simd + - cargo +nightly-2024-12-14 test --no-default-features --features std,simd - cd .. # Test fastfreeimage - cd fastfreeimage - - cargo +nightly-2024-07-25 test --features portsimd + - cargo +nightly-2024-12-14 test --features portsimd - cd .. test_flydra_feature_detector: @@ -375,7 +375,7 @@ led-box-standalone-ubuntu2004-deb: name: "led-box-standalone-debs-${CI_COMMIT_SHA}" build-freemovr-calibration: - image: rust:1.80 + image: rust:1.82 script: - export RUSTFLAGS="-D warnings" - cd freemovr-calibration/freemovr-calibration-cli @@ -390,7 +390,7 @@ build-freemovr-calibration: name: "freemovr-cal-linux-${CI_COMMIT_SHA}" build-freemovr-calibration-webapp: - image: rust:1.80 + image: rust:1.82 script: - export RUSTFLAGS="-D warnings" - export PATH="$PATH:$CARGO_HOME/bin" @@ -1221,7 +1221,7 @@ fmf-cli-ubuntu2204: name: "fmf-cli-ubuntu2204-${CI_COMMIT_SHA}" braid-webapps: - image: rust:1.80 + image: rust:1.82 script: - export RUSTFLAGS="-D warnings" @@ -1359,7 +1359,7 @@ braid-ubuntu2204: name: "braid-ubuntu2204-${CI_COMMIT_SHA}" led-box-linux: - image: rust:1.80 + image: rust:1.82 script: - apt-get update - DEBIAN_FRONTEND=noninteractive apt-get install -y libudev-dev @@ -1375,7 +1375,7 @@ led-box-linux: name: "led-box-linux-${CI_COMMIT_SHA}" led-box-firmware: - image: rust:1.80 + image: rust:1.82 script: - rustc --version - cd led-box-firmware @@ -1570,7 +1570,7 @@ build_simple: - cargo build --release test_user_guide: - image: rust:1.80 + image: rust:1.82 script: - cd strand-braid-user/users-guide - curl -sSL https://github.com/rust-lang/mdBook/releases/download/v0.4.18/mdbook-v0.4.18-x86_64-unknown-linux-gnu.tar.gz | tar -xz diff --git a/_packaging/setup-ubuntu-20.04.sh b/_packaging/setup-ubuntu-20.04.sh index 3db9fd20d..f6664688c 100755 --- a/_packaging/setup-ubuntu-20.04.sh +++ b/_packaging/setup-ubuntu-20.04.sh @@ -10,7 +10,7 @@ echo $ORIG_DIR # Install nightly Rust. Use specific "known good" version of nightly because # occasionally breakage happens. cd /tmp -curl -O --show-error --fail --silent https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-gnu/rustup-init && chmod a+x rustup-init && ./rustup-init -y --default-toolchain nightly-2024-04-15 +curl -O --show-error --fail --silent https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-gnu/rustup-init && chmod a+x rustup-init && ./rustup-init -y --default-toolchain nightly-2024-12-14 # Note: this is not a good general-purpose way to install wasm-pack, because it # does not install wasm-bindgen. Instead, use the installer at diff --git a/_packaging/setup-ubuntu-22.04.sh b/_packaging/setup-ubuntu-22.04.sh index 3db9fd20d..f6664688c 100755 --- a/_packaging/setup-ubuntu-22.04.sh +++ b/_packaging/setup-ubuntu-22.04.sh @@ -10,7 +10,7 @@ echo $ORIG_DIR # Install nightly Rust. Use specific "known good" version of nightly because # occasionally breakage happens. cd /tmp -curl -O --show-error --fail --silent https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-gnu/rustup-init && chmod a+x rustup-init && ./rustup-init -y --default-toolchain nightly-2024-04-15 +curl -O --show-error --fail --silent https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-gnu/rustup-init && chmod a+x rustup-init && ./rustup-init -y --default-toolchain nightly-2024-12-14 # Note: this is not a good general-purpose way to install wasm-pack, because it # does not install wasm-bindgen. Instead, use the installer at diff --git a/_packaging/setup-ubuntu-24.04.sh b/_packaging/setup-ubuntu-24.04.sh index 3db9fd20d..f6664688c 100755 --- a/_packaging/setup-ubuntu-24.04.sh +++ b/_packaging/setup-ubuntu-24.04.sh @@ -10,7 +10,7 @@ echo $ORIG_DIR # Install nightly Rust. Use specific "known good" version of nightly because # occasionally breakage happens. cd /tmp -curl -O --show-error --fail --silent https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-gnu/rustup-init && chmod a+x rustup-init && ./rustup-init -y --default-toolchain nightly-2024-04-15 +curl -O --show-error --fail --silent https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-gnu/rustup-init && chmod a+x rustup-init && ./rustup-init -y --default-toolchain nightly-2024-12-14 # Note: this is not a good general-purpose way to install wasm-pack, because it # does not install wasm-bindgen. Instead, use the installer at