diff --git a/.github/workflows/ci-unified.yml b/.github/workflows/ci-unified.yml index 31963fe..4beb25f 100644 --- a/.github/workflows/ci-unified.yml +++ b/.github/workflows/ci-unified.yml @@ -16,8 +16,8 @@ env: REGISTRY_PATH: "docker.io/paritytech" REGISTRY_PATH_PR: "docker.io/paritypr" IMAGE_NAME: "ci-unified" - RUST_STABLE_VERSION: "1.88.0" - RUST_NIGHTLY_VERSION: "2025-06-27" + RUST_STABLE_VERSION: "1.92.0" + RUST_NIGHTLY_VERSION: "2026-01-14" FORKLIFT_VERSION: "0.14.3" CODECOV_UPLOADER_VERSION: "v0.7.3" CODECOV_CLI_VERSION: "v0.6.0" @@ -52,8 +52,11 @@ jobs: registry-password: ${{ secrets.REGISTRY_PASSWORD }} build-opts: "--squash" image-tags: | - ${{ env.REGISTRY_PATH_PR }}/${{ env.IMAGE_NAME }}:staging - ${{ env.REGISTRY_PATH_PR }}/${{ env.IMAGE_NAME }}:staging-${{ env.DISTRO_CODENAME }}-${{ env.RUST_STABLE_VERSION }}-v${{ steps.vars.outputs.DATESTAMP }} + ${{ env.REGISTRY_PATH_PR }}/${{ env.IMAGE_NAME }}:latest + ${{ env.REGISTRY_PATH_PR }}/${{ env.IMAGE_NAME }}:${{ env.DISTRO_CODENAME }}-${{ env.RUST_STABLE_VERSION }} + ${{ env.REGISTRY_PATH_PR }}/${{ env.IMAGE_NAME }}:${{ env.DISTRO_CODENAME }}-${{ env.RUST_STABLE_VERSION }}-v${{ steps.vars.outputs.DATESTAMP }} + ${{ env.REGISTRY_PATH_PR }}/${{ env.IMAGE_NAME }}:${{ env.DISTRO_CODENAME }}-${{ env.RUST_STABLE_VERSION }}-${{ env.RUST_NIGHTLY_VERSION }} + ${{ env.REGISTRY_PATH_PR }}/${{ env.IMAGE_NAME }}:${{ env.DISTRO_CODENAME }}-${{ env.RUST_STABLE_VERSION }}-${{ env.RUST_NIGHTLY_VERSION }}-v${{ steps.vars.outputs.DATESTAMP }} build-args: | RUST_STABLE_VERSION=${{ env.RUST_STABLE_VERSION }} RUST_NIGHTLY_VERSION=${{ env.RUST_NIGHTLY_VERSION }} diff --git a/ci-unified/Dockerfile b/ci-unified/Dockerfile index 13cfad1..a19921d 100644 --- a/ci-unified/Dockerfile +++ b/ci-unified/Dockerfile @@ -222,8 +222,7 @@ RUN rustup component add \ # ink-ci-linux # We require `grcov` for coverage reporting and `rust-covfix` to improve it. -# We require `xargo` so that `miri` runs properly -RUN cargo install grcov rust-covfix xargo +RUN cargo install grcov rust-covfix ### ink-waterfall-ci ### @@ -274,7 +273,7 @@ RUN cargo install --git https://github.com/paritytech/ink-waterfall.git csv-comp # codecov from ink-ci-linux # parity-scale-codec -RUN cargo +nightly-${RUST_NIGHTLY_VERSION} install grcov rust-covfix xargo dylint-link +RUN cargo +nightly-${RUST_NIGHTLY_VERSION} install grcov rust-covfix dylint-link # install rustc-rv32e-toolchain diff --git a/ci-unified/README.md b/ci-unified/README.md index 6ad66ef..e31d797 100644 --- a/ci-unified/README.md +++ b/ci-unified/README.md @@ -9,8 +9,8 @@ This image is used for running CI jobs for Parity repositories. It could also wo The actual image's revision is based on Debian 11 (aka `bullseye`) and contains the following: -* Rust stable 1.88.0 -* Rust nightly 2025-06-27 +* Rust stable 1.92.0 +* Rust nightly 2026-01-14 * LLVM 15 * Python 3.9.2 * Ruby 2.7.4