Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade golang to 1.23.1 #33

Merged
merged 3 commits into from
Sep 12, 2024
Merged

Upgrade golang to 1.23.1 #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b7ecfd
Upgrade golang to 1.23.1
ajardimTM Sep 12, 2024
34a18a6
changing golang version for github actions
ajardimTM Sep 12, 2024
32ca234
golangci-lint update
ajardimTM Sep 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/golangci-lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: '1.21'
go-version: '1.23.1'
cache: false
- name: golangci-lint
uses: golangci/golangci-lint-action@v4
with:
# Require: The version of golangci-lint to use.
version: v1.54
version: v1.61

# Optional: working directory, useful for monorepos
working-directory: cardinality
8 changes: 4 additions & 4 deletions Dockerfile-builder
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# 1.22.5-alpine3.19
FROM golang@sha256:2dfb3d5110a53079742bd2bdd6ea83eeb6ea94a4bc539f903850b67b3e59c159 as builder
# 1.23.1-alpine3.20
FROM golang@sha256:ac67716dd016429be8d4c2c53a248d7bcdf06d34127d3dc451bda6aa5a87bc06 as builder

RUN ln -s /usr/local/go/bin/go /usr/local/bin/go

Expand All @@ -17,8 +17,8 @@ RUN go test ./... -race
# env var and flags ensure a static binary
RUN CGO_ENABLED=0 go build -ldflags="-extldflags=-static" .

# alpine:3.19.0
FROM alpine@sha256:af4785ccdbcd5cde71bfd5b93eabd34250b98651f19fe218c91de6c8d10e21c5
# alpine:3.20.3
FROM alpine@sha256:beefdbd8a1da6d2915566fde36db9db0b524eb737fc57cd1367effd16dc0d06d

EXPOSE 9090

Expand Down
4 changes: 2 additions & 2 deletions Dockerfile-builder_distroless
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# 1.22.5-alpine3.19
FROM golang@sha256:2dfb3d5110a53079742bd2bdd6ea83eeb6ea94a4bc539f903850b67b3e59c159 as builder
# 1.23.1-alpine3.20
FROM golang@sha256:ac67716dd016429be8d4c2c53a248d7bcdf06d34127d3dc451bda6aa5a87bc06 as builder

RUN ln -s /usr/local/go/bin/go /usr/local/bin/go

Expand Down
5 changes: 1 addition & 4 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github/thought-machine/prometheus-cardinality-exporter

go 1.22.5
go 1.23.1

require (
github.com/cenkalti/backoff v2.2.1+incompatible
Expand All @@ -26,13 +26,11 @@ require (
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
Expand All @@ -46,7 +44,6 @@ require (
golang.org/x/term v0.21.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/time v0.5.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
Expand Down
Loading