From 342d03b58b1b025018ac3bbe75566b9bdc062f36 Mon Sep 17 00:00:00 2001 From: Aravinth Manivannan Date: Mon, 16 Oct 2023 20:30:41 +0530 Subject: [PATCH] fix: CI: port actions actionx-rust-lang and checkout@v4 --- .github/workflows/clippy-fmt.yml | 30 +++++++++--------------------- .github/workflows/coverage.yml | 9 ++------- .github/workflows/linux.yml | 11 ++--------- 3 files changed, 13 insertions(+), 37 deletions(-) diff --git a/.github/workflows/clippy-fmt.yml b/.github/workflows/clippy-fmt.yml index a3a521ff..638bebf4 100644 --- a/.github/workflows/clippy-fmt.yml +++ b/.github/workflows/clippy-fmt.yml @@ -12,30 +12,21 @@ jobs: fmt: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - - name: Install Rust - uses: actions-rs/toolchain@v1 + - uses: actions/checkout@v4 + # Ensure rustfmt is installed and setup problem matcher + - uses: actions-rust-lang/setup-rust-toolchain@v1 with: - toolchain: stable components: rustfmt - - name: Check with rustfmt - uses: actions-rs/cargo@v1 - with: - command: fmt - args: --all -- --check + - name: Rustfmt Check + uses: actions-rust-lang/rustfmt@v1 clippy: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - - name: Install Rust - uses: actions-rs/toolchain@v1 + - uses: actions/checkout@v4 + - uses: actions-rust-lang/setup-rust-toolchain@v1 with: - toolchain: stable components: clippy - override: true - uses: actions/setup-node@v2 with: @@ -44,8 +35,5 @@ jobs: - name: Build frontend run: make frontend - - name: Check with Clippy - uses: actions-rs/clippy-check@v1 - with: - token: ${{ secrets.GITHUB_TOKEN }} - args: --workspace --tests --all-features + - name: clippy Check + run: cargo clippy --workspace --tests --all-features diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index f3e72bbd..343e626c 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -68,7 +68,7 @@ jobs: steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: load env run: | @@ -81,12 +81,7 @@ jobs: with: node-version: "18.0.0" - - name: Install ${{ matrix.version }} - uses: actions-rs/toolchain@v1 - with: - toolchain: ${{ matrix.version }}-x86_64-unknown-linux-gnu - profile: minimal - override: true + - uses: actions-rust-lang/setup-rust-toolchain@v1 - name: Build frontend run: make frontend diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 1ff0a3d6..3e33086a 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -17,9 +17,7 @@ jobs: fail-fast: false matrix: version: - #- 1.51.0 - stable - # - nightly name: ${{ matrix.version }} - x86_64-unknown-linux-gnu runs-on: ubuntu-latest @@ -69,7 +67,7 @@ jobs: - 3306:3306 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 #- name: ⚡ Cache # uses: actions/cache@v2 # with: @@ -97,12 +95,7 @@ jobs: with: node-version: "18.0.0" - - name: Install ${{ matrix.version }} - uses: actions-rs/toolchain@v1 - with: - toolchain: ${{ matrix.version }}-x86_64-unknown-linux-gnu - profile: minimal - override: true + - uses: actions-rust-lang/setup-rust-toolchain@v1 - name: install nightwatch dep run: sudo apt-get install xvfb