Merge pull request kubernetes-sigs#10 from sttts/sttts-ci-matrix-aggregation

🌱 .github: add golangci-lint aggregation we can use in branch protection

Author: sttts

.github/workflows/golangci-lint.yml renamed to .github/workflows/ci.yml

@@ -1,4 +1,4 @@
-name: golangci-lint
+name: CI
 on:
   pull_request:
     types: [opened, edited, synchronize, reopened]
@@ -14,17 +14,18 @@ permissions:
   checks: write
 
 jobs:
-  golangci:
-    name: lint
+  golangci-lint-matrix:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
         working-directory:
           - ""
           - examples/kind
           - providers/kind
           - examples/cluster-api
           - providers/cluster-api
+    name: golangci-lint [${{ matrix.working-directory }}]
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # tag=v4.2.2
       - name: Calculate go version
@@ -37,6 +38,32 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@2226d7cb06a077cd73e56eedd38eecad18e5d837 # tag=v6.5.0
         with:
-          version: v1.63.4
+          version: v1.64.5
           args: --out-format=colored-line-number
           working-directory: ${{matrix.working-directory}}
+
+  golangci-lint: # aggregate the results of the matrix job. This we can depend on in the branch protection rule.
+    name: golangci-lint
+    runs-on: ubuntu-latest
+    needs:
+    - golangci-lint-matrix
+    if: (failure() || success()) && !contains(needs.golangci-lint-matrix.result, 'skipped')
+    steps:
+    - name: noop
+      run: exit 1
+      if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled')
+
+  test:
+    name: make test
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # tag=v4.2.2
+    - name: Calculate go version
+      id: vars
+      run: echo "go_version=$(make go-version)" >> $GITHUB_OUTPUT
+    - name: Set up Go
+      uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # tag=v5.3.0
+      with:
+        go-version: ${{ steps.vars.outputs.go_version }}
+    - name: make test
+      run: MAKEFLAGS="-s" make test

.github/workflows/test..yml

@@ -98,7 +98,7 @@ $(CONTROLLER_GEN): # Build controller-gen from tools folder.
 	GOBIN=$(TOOLS_BIN_DIR) $(GO_INSTALL) $(CONTROLLER_GEN_PKG) $(CONTROLLER_GEN_BIN) $(CONTROLLER_GEN_VER)
 
 GOLANGCI_LINT_BIN := golangci-lint
-GOLANGCI_LINT_VER := $(shell cat .github/workflows/golangci-lint.yml | grep [[:space:]]version: | sed 's/.*version: //')
+GOLANGCI_LINT_VER := $(shell cat .github/workflows/ci.yml | grep [[:space:]]version: | sed 's/.*version: //')
 GOLANGCI_LINT := $(abspath $(TOOLS_BIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT_VER))
 GOLANGCI_LINT_PKG := github.com/golangci/golangci-lint/cmd/golangci-lint
 

Makefile

@@ -31,5 +31,8 @@ if [[ -n ${CI} ]]; then
     make verify-modules
 fi
 
-header_text "running golangci-lint"
-make lint
+# Only run locally because CI has it run in dedicated jobs
+if [[ -z ${CI} ]]; then
+    header_text "running golangci-lint"
+    make lint
+fi