diff --git a/.github/workflows/_01_pre_check.yml b/.github/workflows/_01_pre_check.yml index b6ccdc9664..67094a2a67 100644 --- a/.github/workflows/_01_pre_check.yml +++ b/.github/workflows/_01_pre_check.yml @@ -8,7 +8,7 @@ jobs: cargo-fmt: runs-on: namespace-profile-rust-builder container: - image: "ghcr.io/${{ github.repository }}/rust-base:nightly-2024-02-04-ubuntu-22.04-48" + image: "ghcr.io/${{ github.repository }}/rust-base:nightly-2024-11-23" credentials: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} @@ -23,7 +23,7 @@ jobs: audit: runs-on: namespace-profile-default container: - image: "ghcr.io/${{ github.repository }}/rust-base:nightly-2024-02-04-ubuntu-22.04-48" + image: "ghcr.io/${{ github.repository }}/rust-base:nightly-2024-11-23" credentials: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} @@ -38,7 +38,7 @@ jobs: cargo-clippy: runs-on: namespace-profile-rust-builder container: - image: "ghcr.io/${{ github.repository }}/rust-base:nightly-2024-02-04-ubuntu-22.04-48" + image: "ghcr.io/${{ github.repository }}/rust-base:nightly-2024-11-23" credentials: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/_10_test.yml b/.github/workflows/_10_test.yml index 6a4bca5a7c..b2957d8035 100644 --- a/.github/workflows/_10_test.yml +++ b/.github/workflows/_10_test.yml @@ -8,7 +8,7 @@ jobs: unit-tests: runs-on: namespace-profile-rust-builder container: - image: "ghcr.io/${{ github.repository }}/rust-base:nightly-2024-02-04-ubuntu-22.04-48" + image: "ghcr.io/${{ github.repository }}/rust-base:nightly-2024-11-23" credentials: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/_11_coverage.yml b/.github/workflows/_11_coverage.yml index 7d307d9a0c..b74c3f54dc 100644 --- a/.github/workflows/_11_coverage.yml +++ b/.github/workflows/_11_coverage.yml @@ -13,7 +13,7 @@ jobs: unit-tests: runs-on: namespace-profile-rust-builder container: - image: "ghcr.io/${{ github.repository }}/rust-base:nightly-2024-02-04-ubuntu-22.04-48" + image: "ghcr.io/${{ github.repository }}/rust-base:nightly-2024-11-23" credentials: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} @@ -29,7 +29,7 @@ jobs: coverage: runs-on: namespace-profile-rust-builder container: - image: "ghcr.io/${{ github.repository }}/rust-base:nightly-2024-02-04-ubuntu-22.04-48" + image: "ghcr.io/${{ github.repository }}/rust-base:nightly-2024-11-23" credentials: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/_20_build.yml b/.github/workflows/_20_build.yml index 6f7f8dcdf4..4445175270 100644 --- a/.github/workflows/_20_build.yml +++ b/.github/workflows/_20_build.yml @@ -27,7 +27,7 @@ jobs: compile: runs-on: namespace-profile-rust-builder container: - image: "ghcr.io/${{ github.repository }}/rust-base:nightly-2024-02-04-ubuntu-22.04-48" + image: "ghcr.io/${{ github.repository }}/rust-base:nightly-2024-11-23" credentials: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} @@ -73,7 +73,7 @@ jobs: run: | mkdir -p ./target/${{ inputs.binary-subdir }} cp ./target/${{ inputs.binary-subdir }}/deps/libchainflip_engine_v*.so ./target/${{ inputs.binary-subdir }}/ || true - + - name: Upload binary artifacts uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 with: diff --git a/.github/workflows/_25_package.yml b/.github/workflows/_25_package.yml index 59d9406647..b08a1331af 100644 --- a/.github/workflows/_25_package.yml +++ b/.github/workflows/_25_package.yml @@ -14,7 +14,7 @@ jobs: packages: runs-on: namespace-profile-rust-builder container: - image: "ghcr.io/${{ github.repository }}/rust-base:nightly-2024-02-04-ubuntu-22.04-48" + image: "ghcr.io/${{ github.repository }}/rust-base:nightly-2024-11-23" credentials: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/ci-benchmarks.yml b/.github/workflows/ci-benchmarks.yml index cb9edd7325..3229a12f5d 100644 --- a/.github/workflows/ci-benchmarks.yml +++ b/.github/workflows/ci-benchmarks.yml @@ -12,7 +12,7 @@ jobs: matrix: profile: [release, production] container: - image: "ghcr.io/${{ github.repository }}/rust-base:nightly-2024-02-04-ubuntu-22.04-48" + image: "ghcr.io/${{ github.repository }}/rust-base:nightly-2024-11-23" credentials: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} diff --git a/ci/docker/development/rust-base.Dockerfile b/ci/docker/development/rust-base.Dockerfile index ca90afe5f4..069b37e2c7 100644 --- a/ci/docker/development/rust-base.Dockerfile +++ b/ci/docker/development/rust-base.Dockerfile @@ -60,7 +60,8 @@ WORKDIR / COPY rust-toolchain.toml . RUN rustup update \ && cargo install cargo-deb \ - && cargo install cargo-audit \ + # Using a specific version rather than latest pending resolution of https://github.com/rustsec/rustsec/issues/1296 + && cargo install --locked --version=^0.20 cargo-audit \ && rm rust-toolchain.toml RUN rustc --version && \