ci: optimize linter script (#18480)

2023-11-16 12:57:32 +00:00
parent c106c5600b
commit 3853e7ff70
6 changed files with 59 additions and 55 deletions
@@ -22,6 +22,20 @@ jobs:
          check-latest: true
      - uses: technote-space/get-diff-action@v6.1.2
        id: git_diff
+        with:
+          PATTERNS: |
+            Makefile
+            **/Makefile
+            .golangci.yml
+      - name: run linting (long)
+        if: env.GIT_DIFF
+        id: lint_long
+        run: |
+          nix develop -c make lint
+        env:
+          NIX: 1
+      - uses: technote-space/get-diff-action@v6.1.2
+        if: steps.lint_long.outcome == 'skipped'
        with:
          PATTERNS: |
            **/*.go
@@ -29,33 +43,11 @@ jobs:
            go.sum
            **/go.mod
            **/go.sum
-      #   with:
-      #     PATTERNS: |
-      #       Makefile
-      #       **/Makefile
-      #       .golangci.yml
-      - name: run linting (long)
-        # if: env.GIT_DIFF
-        # id: lint_long
+      - name: run linting (short)
+        if: steps.lint_long.outcome == 'skipped' && env.GIT_DIFF
        run: |
          nix develop -c make lint
        env:
+          GIT_DIFF: ${{ env.GIT_DIFF }}
+          LINT_DIFF: 1
          NIX: 1
-      # - uses: technote-space/get-diff-action@v6.1.2
-      #   if: steps.lint_long.outcome == 'skipped'
-      #   id: git_diff_all
-      #   with:
-      #     PATTERNS: |
-      #       **/*.go
-      #       go.mod
-      #       go.sum
-      #       **/go.mod
-      #       **/go.sum
-      # - name: run linting (short)
-      #   if: steps.lint_long.outcome == 'skipped' && env.GIT_DIFF
-      #   run: |
-      #     nix develop -c make lint
-      #   env:
-      #     GIT_DIFF: ${{ env.GIT_DIFF }}
-      #     LINT_DIFF: 1
-      #     NIX: 1