From 987aec94ef92fe669b2ba273984fb2d237caab61 Mon Sep 17 00:00:00 2001
From: SuperQ <superq@gmail.com>
Date: Tue, 5 Dec 2023 08:46:18 +0100
Subject: [PATCH] Update CI

* Split golangci-lint to separate action file so it's auto-updated.
* Update Go version in CI.
* Update minimum Go version.

Signed-off-by: SuperQ <superq@gmail.com>
---
 .github/workflows/ci.yml            | 18 +---------------
 .github/workflows/golangci-lint.yml | 32 +++++++++++++++++++++++++++++
 .golangci.yml                       |  1 -
 go.mod                              |  2 +-
 4 files changed, 34 insertions(+), 19 deletions(-)
 create mode 100644 .github/workflows/golangci-lint.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4382f7c9..6db41615 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,4 +1,3 @@
----
 name: CI
 on:  # yamllint disable-line rule:truthy
   pull_request:
@@ -8,24 +7,9 @@ jobs:
     name: Test
     runs-on: ubuntu-latest
     container:
-      image: quay.io/prometheus/golang-builder:1.20-base
+      image: quay.io/prometheus/golang-builder:1.21-base
     steps:
       - uses: actions/checkout@v3
       - uses: prometheus/promci@v0.0.2
       - uses: ./.github/promci/actions/setup_environment
       - run: make test
-
-  golangci:
-    name: golangci-lint
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-      - name: Install Go
-        uses: actions/setup-go@v3
-        with:
-          go-version: '1.20'
-      - name: Lint
-        uses: golangci/golangci-lint-action@v3.4.0
-        with:
-          version: v1.51.2
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
new file mode 100644
index 00000000..ffa6b309
--- /dev/null
+++ b/.github/workflows/golangci-lint.yml
@@ -0,0 +1,32 @@
+---
+# This action is synced from https://github.com/prometheus/prometheus
+name: golangci-lint
+on:
+  push:
+    paths:
+      - "go.sum"
+      - "go.mod"
+      - "**.go"
+      - "scripts/errcheck_excludes.txt"
+      - ".github/workflows/golangci-lint.yml"
+      - ".golangci.yml"
+  pull_request:
+
+jobs:
+  golangci:
+    name: lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - name: install Go
+        uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 # v3.5.0
+        with:
+          go-version: 1.21.x
+      - name: Install snmp_exporter/generator dependencies
+        run: sudo apt-get update && sudo apt-get -y install libsnmp-dev
+        if: github.repository == 'prometheus/snmp_exporter'
+      - name: Lint
+        uses: golangci/golangci-lint-action@3a919529898de77ec3da873e3063ca4b10e7f5cc # v3.7.0
+        with:
+          version: v1.54.2
diff --git a/.golangci.yml b/.golangci.yml
index a1265d5f..94dae508 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -17,4 +17,3 @@ linters-settings:
       - (net/http.ResponseWriter).Write
       # Never check for logger errors.
       - (github.com/go-kit/log.Logger).Log
-
diff --git a/go.mod b/go.mod
index 50fcab48..45e8d607 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/prometheus/exporter-toolkit
 
-go 1.18
+go 1.19
 
 require (
 	github.com/alecthomas/kingpin/v2 v2.4.0