Skip to content

Commit 2aead8b

Browse files
authored
Merge pull request #271 from prometheus-community/superq/go_1.25
Update build
2 parents 0f2e258 + d007d4d commit 2aead8b

File tree

5 files changed

+11
-13
lines changed

5 files changed

+11
-13
lines changed

.circleci/config.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: 2.1
33
executors:
44
golang:
55
docker:
6-
- image: cimg/go:1.22
6+
- image: cimg/go:1.25
77
jobs:
88
test:
99
executor: golang
@@ -18,11 +18,11 @@ jobs:
1818
- restore_cache:
1919
keys:
2020
- v5-crossbuild-cache
21-
- run: go install github.com/goreleaser/goreleaser@v1.7.0
21+
- run: go install github.com/goreleaser/goreleaser/v2@v2.12.7
2222
- run: git reset --hard
2323
- run: make crossbuild
2424
- run: mkdir artifacts
25-
- run: mv dist/*.tar.gz dist/checksums.txt artifacts
25+
- run: mv -v dist/*.json dist/promql-langserver* artifacts
2626
- store_artifacts:
2727
path: ./artifacts
2828
- save_cache:
@@ -40,7 +40,7 @@ jobs:
4040
- v5-crossbuild-cache
4141
- run: docker login docker.io -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
4242
- run: docker login quay.io -u $QUAY_LOGIN -p $QUAY_PASSWORD
43-
- run: cd ..; GO111MODULE=on go get github.com/goreleaser/goreleaser@v0.131.1
43+
- run: cd ..; go install github.com/goreleaser/goreleaser/v2@v2.12.7
4444
- run: git reset --hard
4545
- run: make release
4646
check_repo_consistency:

.goreleaser.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
# This is an example goreleaser.yaml file with some sane defaults.
22
# Make sure to check the documentation at http://goreleaser.com
33
builds:
4-
- env:
5-
- GO111MODULE=on
6-
main: ./cmd/promql-langserver
4+
- main: ./cmd/promql-langserver
75
goos:
86
- linux
97
- windows

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,11 @@ htmlcover:
8484

8585
.PHONY: crossbuild
8686
crossbuild:
87-
goreleaser --skip-publish --rm-dist --snapshot
87+
goreleaser build --snapshot
8888

8989
.PHONY: release
9090
release:
91-
goreleaser
91+
goreleaser release
9292

9393
.PHONY: golangci-lint-version
9494
golangci-lint-version:

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/prometheus-community/promql-langserver
22

3-
go 1.21
3+
go 1.24.0
44

55
require (
66
github.com/blang/semver v3.5.1+incompatible
@@ -14,7 +14,7 @@ require (
1414
github.com/rakyll/statik v0.1.7
1515
github.com/sahilm/fuzzy v0.1.1
1616
github.com/stretchr/testify v1.9.0
17-
golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f
17+
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da
1818
gopkg.in/yaml.v3 v3.0.1
1919
)
2020

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T
146146
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
147147
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
148148
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
149-
golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f h1:GGU+dLjvlC3qDwqYgL6UgRmHXhOOgns0bZu2Ty5mm6U=
150-
golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
149+
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da h1:noIWHXmPHxILtqtCOPIhSt0ABwskkZKjD3bXGnZGpNY=
150+
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90=
151151
google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
152152
google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
153153
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

0 commit comments

Comments
 (0)