From a64d0154193d18da9456cc0c65b4c180f5da2aec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 May 2024 19:39:48 +0000 Subject: [PATCH 1/3] Bump the github-actions group with 6 updates Bumps the github-actions group with 6 updates: | Package | From | To | | --- | --- | --- | | [actions/checkout](https://github.com/actions/checkout) | `3` | `4` | | [extractions/setup-just](https://github.com/extractions/setup-just) | `1` | `2` | | [actions/upload-artifact](https://github.com/actions/upload-artifact) | `3` | `4` | | [dtolnay/rust-toolchain](https://github.com/dtolnay/rust-toolchain) | `1.67.0` | `1.80.0` | | [actions/download-artifact](https://github.com/actions/download-artifact) | `3` | `4` | | [actions/upload-release-asset](https://github.com/actions/upload-release-asset) | `1.0.1` | `1.0.2` | Updates `actions/checkout` from 3 to 4 - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) Updates `extractions/setup-just` from 1 to 2 - [Release notes](https://github.com/extractions/setup-just/releases) - [Commits](https://github.com/extractions/setup-just/compare/v1...v2) Updates `actions/upload-artifact` from 3 to 4 - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v3...v4) Updates `dtolnay/rust-toolchain` from 1.67.0 to 1.80.0 - [Release notes](https://github.com/dtolnay/rust-toolchain/releases) - [Commits](https://github.com/dtolnay/rust-toolchain/compare/1.67.0...1.80.0) Updates `actions/download-artifact` from 3 to 4 - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/v3...v4) Updates `actions/upload-release-asset` from 1.0.1 to 1.0.2 - [Release notes](https://github.com/actions/upload-release-asset/releases) - [Commits](https://github.com/actions/upload-release-asset/compare/v1.0.1...v1.0.2) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-actions - dependency-name: extractions/setup-just dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-actions - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-actions - dependency-name: dtolnay/rust-toolchain dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions - dependency-name: actions/download-artifact dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-actions - dependency-name: actions/upload-release-asset dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yml | 18 +++++++++--------- .github/workflows/cifuzz.yml | 2 +- .github/workflows/cron.yml | 2 +- .github/workflows/msrv.yml | 6 +++--- .github/workflows/release.yml | 8 ++++---- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a9a32a9568e..4739693908b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,7 +36,7 @@ jobs: runs-on: ubuntu-latest container: debian:buster steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Prerequisites run: apt-get update && apt-get install --no-install-recommends -y ca-certificates curl gcc libc-dev # gcc is required as OS abstraction - name: install Rust via Rustup @@ -47,13 +47,13 @@ jobs: test: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable - uses: Swatinem/rust-cache@v2 - name: Setup dependencies run: sudo apt-get install tree - - uses: extractions/setup-just@v1 + - uses: extractions/setup-just@v2 - name: test env: CI: true @@ -69,7 +69,7 @@ jobs: - ubuntu-latest runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable - uses: Swatinem/rust-cache@v2 - name: Setup dependencies (macos) @@ -94,7 +94,7 @@ jobs: matrix: target: [ armv7-linux-androideabi ] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable - uses: Swatinem/rust-cache@v2 - name: Install Rust @@ -135,7 +135,7 @@ jobs: target: i686-pc-windows-gnu runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install Rust uses: dtolnay/rust-toolchain@master with: @@ -156,12 +156,12 @@ jobs: lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@master with: toolchain: stable components: clippy,rustfmt - - uses: extractions/setup-just@v1 + - uses: extractions/setup-just@v2 - name: Run cargo clippy run: just clippy -D warnings -A unknown-lints - name: Run cargo doc @@ -189,7 +189,7 @@ jobs: continue-on-error: ${{ matrix.checks == 'advisories' }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: EmbarkStudios/cargo-deny-action@v1 with: command: check ${{ matrix.checks }} diff --git a/.github/workflows/cifuzz.yml b/.github/workflows/cifuzz.yml index 0fd6950846c..350029cec1f 100644 --- a/.github/workflows/cifuzz.yml +++ b/.github/workflows/cifuzz.yml @@ -17,7 +17,7 @@ jobs: language: rust fuzz-seconds: 600 - name: Upload Crash - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: failure() && steps.build.outcome == 'success' with: name: artifacts diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml index 812b3ec7cf0..c4479841d8a 100644 --- a/.github/workflows/cron.yml +++ b/.github/workflows/cron.yml @@ -9,7 +9,7 @@ jobs: stress: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: Swatinem/rust-cache@v2 - name: stress run: make stress diff --git a/.github/workflows/msrv.yml b/.github/workflows/msrv.yml index 1e77eaa241d..4e7720e6947 100644 --- a/.github/workflows/msrv.yml +++ b/.github/workflows/msrv.yml @@ -19,7 +19,7 @@ jobs: - ubuntu-latest runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 - - uses: dtolnay/rust-toolchain@1.67.0 # dictated by `firefox` to support the `helix` editor, but now driven by the `time` crate. IMPORTANT: adjust etc/msrv-badge.svg as well - - uses: extractions/setup-just@v1 + - uses: actions/checkout@v4 + - uses: dtolnay/rust-toolchain@1.80.0 # dictated by `firefox` to support the `helix` editor, but now driven by the `time` crate. IMPORTANT: adjust etc/msrv-badge.svg as well + - uses: extractions/setup-just@v2 - run: just ci-check-msrv diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3cb6d99c6f0..06e73353cfd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -60,7 +60,7 @@ jobs: run: echo "${{ env.ARTIFACT_VERSION }}" > artifacts/release-version - name: Upload artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: artifacts path: artifacts @@ -129,7 +129,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 1 @@ -161,7 +161,7 @@ jobs: echo "target dir is: ${{ env.TARGET_DIR }}" - name: Get release download URL - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: artifacts path: artifacts @@ -211,7 +211,7 @@ jobs: fi - name: Upload release archive - uses: actions/upload-release-asset@v1.0.1 + uses: actions/upload-release-asset@v1.0.2 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: From cd6d578e347d989f44c48892fc567286c5f2db22 Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Tue, 7 May 2024 21:49:06 +0200 Subject: [PATCH 2/3] undo MSRV change in the Rust-toolchain plugin If this doesn't work, so it happens once per week now, better replace it with rustup invocations. --- .github/workflows/msrv.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/msrv.yml b/.github/workflows/msrv.yml index 4e7720e6947..0bcac07d3b1 100644 --- a/.github/workflows/msrv.yml +++ b/.github/workflows/msrv.yml @@ -20,6 +20,6 @@ jobs: runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@1.80.0 # dictated by `firefox` to support the `helix` editor, but now driven by the `time` crate. IMPORTANT: adjust etc/msrv-badge.svg as well + - uses: dtolnay/rust-toolchain@1.67.0 # dictated by `firefox` to support the `helix` editor, but now driven by the `time` crate. IMPORTANT: adjust etc/msrv-badge.svg as well - uses: extractions/setup-just@v2 - run: just ci-check-msrv From c97ee2773d2c7ab021d075a3d150f07ed4158f83 Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Wed, 8 May 2024 07:27:09 +0200 Subject: [PATCH 3/3] remove `dtolnay` action in favor of plain rustup calls Using it when availble as standard tool seems preferable over using an action that potentially hides away what's truly going on (after all, it also calls `rustup` under the hood) --- .github/workflows/msrv.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/msrv.yml b/.github/workflows/msrv.yml index 0bcac07d3b1..19e6fb382a6 100644 --- a/.github/workflows/msrv.yml +++ b/.github/workflows/msrv.yml @@ -18,8 +18,13 @@ jobs: - windows-2019 - ubuntu-latest runs-on: ${{ matrix.os }} + env: + # dictated by `firefox` to support the `helix` editor, but now driven by the `time` crate. IMPORTANT: adjust etc/msrv-badge.svg as well + rust_version: 1.67.0 steps: - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@1.67.0 # dictated by `firefox` to support the `helix` editor, but now driven by the `time` crate. IMPORTANT: adjust etc/msrv-badge.svg as well - uses: extractions/setup-just@v2 + - run: | + rustup toolchain install $rust_version --profile minimal --no-self-update + rustup default $rust_version - run: just ci-check-msrv