From 3b108af2057ab8c2a89615902a43febe5a401643 Mon Sep 17 00:00:00 2001
From: Luca Comellini <luca.com@gmail.com>
Date: Wed, 27 Jul 2022 14:16:34 -0700
Subject: [PATCH] Move lint to separate workflow, use concurrency feature to
 cancel runs

---
 .github/workflows/ci.yml              | 49 ++------------------
 .github/workflows/codeql-analysis.yml |  4 ++
 .github/workflows/fossa.yml           | 11 +++--
 .github/workflows/lint.yml            | 64 +++++++++++++++++++++++++++
 4 files changed, 77 insertions(+), 51 deletions(-)
 create mode 100644 .github/workflows/lint.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d0f00efc53..5d1174a39e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,9 +22,9 @@ defaults:
   run:
     shell: bash
 
-env:
-  DOCKER_BUILDKIT: 1
-  GOLANGCI_TIMEOUT: 10m0s
+concurrency:
+  group: ${{ github.ref_name }}-ci
+  cancel-in-progress: true
 
 jobs:
 
@@ -38,10 +38,6 @@ jobs:
       version: ${{ steps.vars.outputs.version }}
       date: ${{ steps.vars.outputs.date }}
     steps:
-      - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.9.1
-        with:
-          access_token: ${{ secrets.GITHUB_TOKEN }}
       - name: Checkout Repository
         uses: actions/checkout@v3
       - name: Output Variables
@@ -53,43 +49,6 @@ jobs:
           echo "::set-output name=version::$(grep "VERSION = " Makefile | cut -d " " -f 3)"
           echo "::set-output name=date::$(date -u +"%Y-%m-%dT%H:%M:%SZ")"
 
-  lint:
-    name: Lint
-    runs-on: ubuntu-20.04
-    needs: vars
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v3
-      - name: Setup Golang Environment
-        uses: actions/setup-go@v3
-        with:
-          go-version: ${{ needs.vars.outputs.go_version }}
-      - name: Lint Code
-        uses: golangci/golangci-lint-action@v3.2.0
-        with:
-          args: --timeout ${{ env.GOLANGCI_TIMEOUT }}
-
-  njs-lint:
-    name: NJS Lint
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v2
-      - name: Run Prettier on NJS code
-        id: prettier-run
-        uses: rutajdash/prettier-cli-action@v1.0.0
-        with:
-          config_path: ${{ github.workspace }}/internal/nginx/modules/.prettierrc
-          file_pattern: ${{ github.workspace }}/internal/nginx/modules/**/*.js
-          prettier_version: 2.6.2
-      - name: Prettier Output
-        if: ${{ failure() }}
-        shell: bash
-        run: |
-          echo "The following files are not formatted:"
-          echo "${{steps.prettier-run.outputs.prettier_output}}"
-          echo "Run \"make njs-fmt\" locally to format the code"
-
   unit-tests:
     name: Unit Tests
     runs-on: ubuntu-20.04
@@ -126,7 +85,7 @@ jobs:
   binary:
     name: Build Binary
     runs-on: ubuntu-20.04
-    needs: [vars, lint]
+    needs: vars
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v3
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 34d655262f..87a6d5fdd4 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -20,6 +20,10 @@ on:
   schedule:
     - cron: '39 13 * * 6'
 
+concurrency:
+  group: ${{ github.ref_name }}-codeql
+  cancel-in-progress: true
+
 jobs:
   analyze:
     name: Analyze
diff --git a/.github/workflows/fossa.yml b/.github/workflows/fossa.yml
index 9bb9914f0c..b9fe65776d 100644
--- a/.github/workflows/fossa.yml
+++ b/.github/workflows/fossa.yml
@@ -5,19 +5,18 @@ on:
     branches:
       - main
 
-jobs:
+concurrency:
+  group: ${{ github.ref_name }}-fossa
+  cancel-in-progress: true
 
+jobs:
   scan:
     name: Fossa
     runs-on: ubuntu-20.04
     steps:
-      - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.9.1
-        with:
-          access_token: ${{ secrets.GITHUB_TOKEN }}
       - name: Checkout Repository
         uses: actions/checkout@v3
       - name: Scan
         uses: fossas/fossa-action@v1
         with:
-          api-key: ${{ secrets.FOSSA_TOKEN }}
\ No newline at end of file
+          api-key: ${{ secrets.FOSSA_TOKEN }}
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
new file mode 100644
index 0000000000..a659014159
--- /dev/null
+++ b/.github/workflows/lint.yml
@@ -0,0 +1,64 @@
+name: Lint
+
+on:
+  push:
+    branches:
+      - main
+    paths-ignore:
+      - '**.md'
+  pull_request:
+    branches:
+      - main
+    paths-ignore:
+      - '**.md'
+    types:
+      - opened
+      - reopened
+      - synchronize
+
+defaults:
+  run:
+    shell: bash
+
+concurrency:
+  group: ${{ github.ref_name }}-lint
+  cancel-in-progress: true
+
+jobs:
+
+  lint:
+    name: Lint
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+      - name: Setup Golang Environment
+        uses: actions/setup-go@v3
+        with:
+          go-version-file: go.mod
+      - name: Lint Code
+        uses: golangci/golangci-lint-action@v3.2.0
+        with:
+          args: --timeout 10m0s
+          only-new-issues: true
+
+  njs-lint:
+    name: NJS Lint
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v2
+      - name: Run Prettier on NJS code
+        id: prettier-run
+        uses: rutajdash/prettier-cli-action@v1.0.0
+        with:
+          config_path: ${{ github.workspace }}/internal/nginx/modules/.prettierrc
+          file_pattern: ${{ github.workspace }}/internal/nginx/modules/**/*.js
+          prettier_version: 2.6.2
+      - name: Prettier Output
+        if: ${{ failure() }}
+        shell: bash
+        run: |
+          echo "The following files are not formatted:"
+          echo "${{steps.prettier-run.outputs.prettier_output}}"
+          echo "Run \"make njs-fmt\" locally to format the code"