lint

jdx · Dec 7, 2023 · 78a908d · 78a908d
1 parent 43d166b
commit 78a908d
Showing 1 changed file with 7 additions and 19 deletions.
diff --git a/.github/workflows/rtx.yml b/.github/workflows/rtx.yml
@@ -23,6 +23,9 @@ jobs:
     timeout-minutes: 10
     steps:
       - uses: actions/checkout@v4
+        with:
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
+          ref: ${{ github.event.pull_request.head.ref }}
       - uses: Swatinem/rust-cache@v2
         with:
           shared-key: unit
@@ -33,33 +36,18 @@ jobs:
       #     tool: nextest,just,cargo-deny,cargo-msrv,cargo-machete
       # - name: Install direnv/shfmt
       #   run: sudo apt-get update; sudo apt-get install direnv shfmt
+      - run: sudo apt-get update; sudo apt-get install shfmt shellcheck
       - run: cargo nextest run --all-features
         env:
           RUST_BACKTRACE: "1"
       - run: just lint
       - run: cargo deny check
       - run: cargo msrv verify
       - run: cargo machete --with-metadata
-
-  lint-fix:
-    runs-on: buildjet-4vcpu-ubuntu-2204
-    timeout-minutes: 10
-    if: github.event_name == 'pull_request'
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
-          ref: ${{ github.event.pull_request.head.ref }}
-
-      - uses: Swatinem/rust-cache@v2
-        with:
-          shared-key: unit
-          save-if: ${{ github.event_name == 'push' && github.ref_name == 'main' }}
-          cache-provider: buildjet
-      - run: sudo apt-get update; sudo apt-get install shfmt shellcheck
       - uses: taiki-e/install-action@just
-      - run: just lint-fix render-all
-      - uses: EndBug/add-and-commit@v9
+      - run: just render-all linf-fix
+      - if: github.event_name == 'pull_request'
+        uses: EndBug/add-and-commit@v9
         with:
           push: true