From d091449b0242aad00673324689f3142f13a0123f Mon Sep 17 00:00:00 2001 From: alvicsam Date: Wed, 3 May 2023 13:36:28 +0200 Subject: [PATCH 1/2] [ci] Run gha fmt in docker --- .github/workflows/fmt-check.yml | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/.github/workflows/fmt-check.yml b/.github/workflows/fmt-check.yml index 6c7a5f3f910..a6a3ef007e9 100644 --- a/.github/workflows/fmt-check.yml +++ b/.github/workflows/fmt-check.yml @@ -13,24 +13,9 @@ jobs: matrix: os: ["ubuntu-latest"] runs-on: ${{ matrix.os }} + container: + image: paritytech/ci-linux:production steps: - - name: Install Rust nightly toolchain - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f # v1.0.7 - with: - profile: minimal - toolchain: nightly - override: true - components: clippy, rustfmt - - - name: Cache Dependencies & Build Outputs - uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1 - with: - path: | - ~/.cargo/registry - ~/.cargo/git - target - key: ${{ runner.os }}-${{ matrix.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} - - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2 - name: Cargo fmt From 8dd4d5fd0187aa9b3d34757030de763345a95202 Mon Sep 17 00:00:00 2001 From: alvicsam Date: Wed, 3 May 2023 13:39:42 +0200 Subject: [PATCH 2/2] use cargo run instead action --- .github/workflows/fmt-check.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/fmt-check.yml b/.github/workflows/fmt-check.yml index a6a3ef007e9..498e42527e3 100644 --- a/.github/workflows/fmt-check.yml +++ b/.github/workflows/fmt-check.yml @@ -19,7 +19,4 @@ jobs: - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2 - name: Cargo fmt - uses: actions-rs/cargo@ae10961054e4aa8b4aa7dffede299aaf087aa33b # v1.0.3 - with: - command: fmt - args: --all -- --check + run: cargo +nightly fmt --all -- --check