Skip to content

Commit

Permalink
Update CI
Browse files Browse the repository at this point in the history
* Split golangci-lint to separate action file so it's auto-updated.
* Update Go version in CI.
* Update minimum Go version.
* Remove deprecated rand.Seed().

Signed-off-by: SuperQ <[email protected]>
  • Loading branch information
SuperQ committed Dec 5, 2023
1 parent 5a3e1a8 commit d37489a
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 27 deletions.
27 changes: 7 additions & 20 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,31 +1,18 @@
---
name: CI
on: # yamllint disable-line rule:truthy
pull_request:
on:
push:
jobs:
test:
name: Test
runs-on: ubuntu-latest
strategy:
matrix:
go_version: ["1.20", "1.21"]
container:
image: quay.io/prometheus/golang-builder:1.20-base
image: quay.io/prometheus/golang-builder:${{ matrix.go_version }}-base
steps:
- uses: actions/checkout@v3
- name: Checkout repository
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- uses: prometheus/[email protected]
- 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/[email protected]
with:
version: v1.51.2
32 changes: 32 additions & 0 deletions .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
@@ -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
7 changes: 6 additions & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,9 @@ linters-settings:
- (net/http.ResponseWriter).Write
# Never check for logger errors.
- (github.com/go-kit/log.Logger).Log

revive:
rules:
# https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md#unused-parameter
- name: unused-parameter
severity: warning
disabled: true
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/prometheus/exporter-toolkit

go 1.18
go 1.20

require (
github.com/alecthomas/kingpin/v2 v2.4.0
Expand Down
5 changes: 0 additions & 5 deletions web/cache.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,10 @@ package web
import (
weakrand "math/rand"
"sync"
"time"
)

var cacheSize = 100

func init() {
weakrand.Seed(time.Now().UnixNano())
}

type cache struct {
cache map[string]bool
mtx sync.Mutex
Expand Down

0 comments on commit d37489a

Please sign in to comment.