Skip to content

Commit 06b57fc

Browse files
authored
Update to go-1.25 (#38)
1 parent 8eda7ea commit 06b57fc

File tree

5 files changed

+98
-119
lines changed

5 files changed

+98
-119
lines changed

.github/workflows/main.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ jobs:
2929
password: ${{ secrets.GITHUB_TOKEN }}
3030

3131
- name: Check out code into the Go module directory
32-
uses: actions/checkout@v4
32+
uses: actions/checkout@v5
3333

34-
- name: Set up Go 1.24
34+
- name: Set up Go 1.25
3535
uses: actions/setup-go@v5
3636
with:
37-
go-version: "1.24"
37+
go-version: "1.25"
3838
cache: false
3939

4040
- name: fake ipxe binary
@@ -43,7 +43,7 @@ jobs:
4343
touch ipxe/ipxe/bin/ipxe.bin
4444
4545
- name: Lint
46-
uses: golangci/golangci-lint-action@v7
46+
uses: golangci/golangci-lint-action@v8
4747
with:
4848
args: --timeout=3m
4949

Dockerfile

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,25 @@
11
# be aware that bookworm has a newer gcc which can not compile the older ipxe
2-
FROM golang:1.24-bullseye AS builder
2+
# newer ipxe can only be used if https://github.com/metal-stack/pixie/issues/34
3+
# is not happening anymore
4+
FROM debian:bullseye AS ipxe-builder
35
WORKDIR /work
46
COPY . .
57
RUN apt update \
68
&& apt install --yes --no-install-recommends \
9+
ca-certificates \
10+
gcc \
11+
git \
12+
libc6-dev \
713
liblzma-dev \
8-
&& make ipxe pixie
14+
make \
15+
&& make ipxe
916

10-
FROM gcr.io/distroless/static-debian12
17+
FROM golang:1.25-trixie AS builder
18+
WORKDIR /work
19+
COPY . .
20+
COPY --from=ipxe-builder /work/ipxe/ipxe /work/ipxe/ipxe
21+
RUN make pixie
22+
23+
FROM gcr.io/distroless/static
1124
COPY --from=builder /work/build/pixie /pixie
1225
ENTRYPOINT ["/pixie"]

README.md

Lines changed: 0 additions & 26 deletions
This file was deleted.

go.mod

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,44 @@
11
module github.com/metal-stack/pixie
22

3-
go 1.24
3+
go 1.25
44

55
require (
6-
github.com/metal-stack/metal-api v0.41.2
6+
github.com/metal-stack/metal-api v0.42.3
77
github.com/metal-stack/v v1.0.3
88
github.com/pin/tftp/v3 v3.1.0
9-
github.com/prometheus/client_golang v1.22.0
10-
github.com/spf13/cobra v1.9.1
9+
github.com/prometheus/client_golang v1.23.1
10+
github.com/spf13/cobra v1.10.1
1111
github.com/spf13/viper v1.20.1
12-
github.com/stretchr/testify v1.10.0
13-
golang.org/x/crypto v0.38.0
14-
golang.org/x/net v0.40.0
15-
google.golang.org/grpc v1.72.2
12+
github.com/stretchr/testify v1.11.1
13+
golang.org/x/crypto v0.41.0
14+
golang.org/x/net v0.43.0
15+
google.golang.org/grpc v1.75.0
1616
)
1717

1818
require (
1919
github.com/beorn7/perks v1.0.1 // indirect
2020
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2121
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
2222
github.com/fsnotify/fsnotify v1.9.0 // indirect
23-
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
23+
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
24+
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect
2425
github.com/inconshreveable/mousetrap v1.1.0 // indirect
2526
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
2627
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
2728
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
2829
github.com/prometheus/client_model v0.6.2 // indirect
29-
github.com/prometheus/common v0.64.0 // indirect
30-
github.com/prometheus/procfs v0.16.1 // indirect
31-
github.com/sagikazarmark/locafero v0.9.0 // indirect
32-
github.com/sourcegraph/conc v0.3.0 // indirect
30+
github.com/prometheus/common v0.66.0 // indirect
31+
github.com/prometheus/procfs v0.17.0 // indirect
32+
github.com/sagikazarmark/locafero v0.10.0 // indirect
33+
github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 // indirect
3334
github.com/spf13/afero v1.14.0 // indirect
34-
github.com/spf13/cast v1.8.0 // indirect
35-
github.com/spf13/pflag v1.0.6 // indirect
35+
github.com/spf13/cast v1.9.2 // indirect
36+
github.com/spf13/pflag v1.0.10 // indirect
3637
github.com/subosito/gotenv v1.6.0 // indirect
37-
go.uber.org/multierr v1.11.0 // indirect
38-
golang.org/x/sys v0.33.0 // indirect
39-
golang.org/x/text v0.25.0 // indirect
40-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237 // indirect
41-
google.golang.org/protobuf v1.36.6 // indirect
38+
golang.org/x/sys v0.35.0 // indirect
39+
golang.org/x/text v0.28.0 // indirect
40+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250826171959-ef028d996bc1 // indirect
41+
google.golang.org/protobuf v1.36.8 // indirect
42+
gopkg.in/yaml.v2 v2.4.0 // indirect
4243
gopkg.in/yaml.v3 v3.0.1 // indirect
4344
)

0 commit comments

Comments
 (0)