Skip to content

Commit 73ef653

Browse files
authored
Merge pull request #5 from fdomain/bump-go
chore: bump to go1.25 and dependencies
2 parents 98d992d + ccd9e7f commit 73ef653

File tree

4 files changed

+71
-489
lines changed

4 files changed

+71
-489
lines changed

.github/workflows/ci.yml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ jobs:
1111
name: "Lint and test"
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v5
1515

1616
- name: Set up Go
17-
uses: actions/setup-go@v3
17+
uses: actions/setup-go@v6
1818
with:
19-
go-version: "1.20"
19+
go-version: "1.25"
2020

2121
- name: Run golangci-lint
22-
uses: golangci/golangci-lint-action@v3
22+
uses: golangci/golangci-lint-action@v9
2323

2424
- name: Test
2525
run: go test -v ./...
@@ -30,14 +30,13 @@ jobs:
3030
commitlint:
3131
runs-on: ubuntu-latest
3232
steps:
33-
- uses: actions/checkout@v3
33+
- uses: actions/checkout@v5
3434
with:
3535
fetch-depth: 0
36-
- name: Install required dependencies
37-
run: |
38-
sudo apt install -y git curl
39-
curl -sL https://deb.nodesource.com/setup_14.x | sudo -E bash -
40-
sudo DEBIAN_FRONTEND=noninteractive apt install -y nodejs
36+
37+
- uses: actions/setup-node@v6
38+
with:
39+
node_version: 'latest'
4140

4241
- name: Install commitlint
4342
run: |

.github/workflows/goreleaser.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Checkout
16-
uses: actions/checkout@v3
16+
uses: actions/checkout@v5
1717
with:
1818
fetch-depth: 0
1919
- name: Fetch all tags
2020
run: git fetch --force --tags
2121
- name: Set up Go
22-
uses: actions/setup-go@v3
22+
uses: actions/setup-go@v6
2323
with:
24-
go-version: "1.20"
24+
go-version: "1.25"
2525
- name: Run GoReleaser
26-
uses: goreleaser/goreleaser-action@v4
26+
uses: goreleaser/goreleaser-action@v6
2727
with:
2828
distribution: goreleaser
2929
version: latest

go.mod

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,25 @@
11
module github.com/criteo/ocserv-exporter
22

3-
go 1.20
3+
go 1.25
44

55
require (
6-
github.com/prometheus/client_golang v1.11.0
7-
github.com/sirupsen/logrus v1.8.1
8-
github.com/stretchr/testify v1.4.0
6+
github.com/prometheus/client_golang v1.23.2
7+
github.com/sirupsen/logrus v1.9.3
8+
github.com/stretchr/testify v1.11.1
99
)
1010

1111
require (
1212
github.com/beorn7/perks v1.0.1 // indirect
13-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
13+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
1414
github.com/davecgh/go-spew v1.1.1 // indirect
15-
github.com/golang/protobuf v1.5.2 // indirect
16-
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
15+
github.com/kr/text v0.2.0 // indirect
16+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
1717
github.com/pmezard/go-difflib v1.0.0 // indirect
18-
github.com/prometheus/client_model v0.2.0 // indirect
19-
github.com/prometheus/common v0.32.1 // indirect
20-
github.com/prometheus/procfs v0.7.3 // indirect
21-
golang.org/x/sys v0.0.0-20211214234402-4825e8c3871d // indirect
22-
google.golang.org/protobuf v1.27.1 // indirect
23-
gopkg.in/yaml.v2 v2.4.0 // indirect
18+
github.com/prometheus/client_model v0.6.2 // indirect
19+
github.com/prometheus/common v0.67.3 // indirect
20+
github.com/prometheus/procfs v0.19.2 // indirect
21+
go.yaml.in/yaml/v2 v2.4.3 // indirect
22+
golang.org/x/sys v0.38.0 // indirect
23+
google.golang.org/protobuf v1.36.10 // indirect
24+
gopkg.in/yaml.v3 v3.0.1 // indirect
2425
)

0 commit comments

Comments
 (0)