From 6b39fd2d64df31110d844f229bad20bb1604c9f8 Mon Sep 17 00:00:00 2001 From: Yash Suthar Date: Tue, 4 Nov 2025 21:00:08 +0530 Subject: [PATCH] Revert "Update CI auto-format (#6233)" This reverts commit 377151a57f1451df5febd09b183d8c4f31ede32d. --- .github/workflows/auto-format.yaml | 64 ------------------------------ .github/workflows/ci.yaml | 6 ++- 2 files changed, 4 insertions(+), 66 deletions(-) delete mode 100644 .github/workflows/auto-format.yaml diff --git a/.github/workflows/auto-format.yaml b/.github/workflows/auto-format.yaml deleted file mode 100644 index 2acf83715a..0000000000 --- a/.github/workflows/auto-format.yaml +++ /dev/null @@ -1,64 +0,0 @@ -on: - workflow_run: - workflows: ["CI"] - types: - - completed - -name: Auto format - -concurrency: - group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }} - cancel-in-progress: true - -jobs: - auto_format_commit: - permissions: - contents: write - pull-requests: write - name: Auto-format code - runs-on: ubuntu-latest - if: ${{ github.event.workflow_run.conclusion == 'success' && !contains(github.event.workflow_run.head_commit.message, '[skip ci]') }} - concurrency: - group: fmt-${{ github.event.workflow_run.head_branch }} - cancel-in-progress: true - - steps: - - name: Checkout code - uses: actions/checkout@v5 - with: - fetch-depth: 0 - ref: ${{ github.event.workflow_run.head_branch }} - repository: ${{ github.event.workflow_run.head_repository.full_name }} - - - name: Setup Rust - uses: dtolnay/rust-toolchain@stable - with: - components: rustfmt - - - name: Run cargo fmt - run: | - echo "Running cargo fmt --all" - cargo fmt --all - - - name: Commit and push if changes - id: commit - run: | - git config user.name "github-actions[bot]" - git config user.email "github-actions[bot]@users.noreply.github.com" - if [ -n "$(git status --porcelain)" ]; then - git add -u - git commit -m "Auto-format code [skip ci]" - git push - echo "formatted=true" >> $GITHUB_OUTPUT - else - echo "formatted=false" >> $GITHUB_OUTPUT - fi - - - name: Comment on PR if formatting was applied - if: steps.commit.outputs.formatted == 'true' && github.event.workflow_run.event == 'pull_request' - uses: marocchino/sticky-pull-request-comment@v2 - with: - message: | - Code has been automatically formatted. - No action needed. - the changes were committed with `[skip ci]`. diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2ce4b47577..977f27f376 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -307,13 +307,15 @@ jobs: run: python -I whats_left.py lint: - name: Check Rust code with clippy + name: Check Rust code with rustfmt and clippy runs-on: ubuntu-latest steps: - uses: actions/checkout@v5 - uses: dtolnay/rust-toolchain@stable with: - components: clippy + components: rustfmt, clippy + - name: run rustfmt + run: cargo fmt --check - name: run clippy on wasm run: cargo clippy --manifest-path=wasm/lib/Cargo.toml -- -Dwarnings - uses: actions/setup-python@v6