From f0ba5724bf4f8c21afdac83169ab8157ed42876e Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Sun, 20 Mar 2022 15:12:32 +0000 Subject: [PATCH 1/4] CI: Migrate to `actions/checkout@v3` --- .github/workflows/ci.yml | 12 ++++++------ .github/workflows/release.yml | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ce744db..4ee58f3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: os: macos-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: actions-rs/toolchain@v1 with: toolchain: 1.51.0 @@ -50,7 +50,7 @@ jobs: timeout-minutes: 30 runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: actions-rs/toolchain@v1 with: toolchain: 1.51.0 @@ -71,7 +71,7 @@ jobs: runs-on: ubuntu-latest continue-on-error: true steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: actions-rs/toolchain@v1 with: toolchain: nightly @@ -92,7 +92,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 # Use stable for this to ensure that cargo-tarpaulin can be built. - uses: actions-rs/toolchain@v1 with: @@ -114,7 +114,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: actions-rs/toolchain@v1 with: toolchain: 1.51.0 @@ -139,7 +139,7 @@ jobs: timeout-minutes: 30 runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: actions-rs/toolchain@v1 with: toolchain: 1.51.0 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f1dec26..3ceb221 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -37,7 +37,7 @@ jobs: asset_suffix: x86_64-darwin.tar.gz steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: actions-rs/toolchain@v1 with: toolchain: stable @@ -98,7 +98,7 @@ jobs: libpcsclite-dev steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: actions-rs/toolchain@v1 with: toolchain: stable From dcdf306d3a48d617afe340b99173f018baa04b16 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Sun, 20 Mar 2022 15:14:41 +0000 Subject: [PATCH 2/4] CI: Refactor rustfmt CI job --- .github/workflows/ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4ee58f3..01e80be 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -143,9 +143,10 @@ jobs: - uses: actions-rs/toolchain@v1 with: toolchain: 1.51.0 + components: rustfmt override: true - - run: rustup component add rustfmt - - uses: actions-rs/cargo@v1 + - name: Check formatting + uses: actions-rs/cargo@v1 with: command: fmt args: -- --check From da9212c135496888e1324086ed9bfef24631638b Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Sun, 20 Mar 2022 15:15:22 +0000 Subject: [PATCH 3/4] CI: Add Dependabot config to keep GitHub Actions up-to-date --- .github/dependabot.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..a3014a1 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,12 @@ +version: 2 +updates: + - package-ecosystem: github-actions + directory: "/" + schedule: + interval: daily + timezone: Etc/UTC + open-pull-requests-limit: 10 + reviewers: + - str4d + assignees: + - str4d From 60b36e39c8bbeb96102d2d029bb117632f28d347 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Sun, 20 Mar 2022 15:17:15 +0000 Subject: [PATCH 4/4] CI: Use `ubuntu-18.04` for Linux release builder GitHub removed `ubuntu-16.04` in September 2021, which causes the release workflow to hang waiting on a runner that will never be made available. --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3ceb221..4baa02b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,7 +20,7 @@ jobs: name: [linux, windows, macos] include: - name: linux - os: ubuntu-16.04 + os: ubuntu-18.04 build_deps: > libpcsclite-dev archive_name: age-plugin-yubikey.tar.gz