Skip to content

Commit c9de606

Browse files
committed
go 1.24
With the release of Go 1.25 we will require 1.24 as the minimum version. Signed-off-by: Lorenz Bauer <[email protected]>
1 parent a785455 commit c9de606

File tree

5 files changed

+15
-20
lines changed

5 files changed

+15
-20
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ env:
1010
CI_MAX_KERNEL_VERSION: '6.16'
1111
CI_MAX_EFW_VERSION: '0.21.0'
1212
CI_MIN_CLANG_VERSION: '13'
13-
go_version: '~1.24'
14-
prev_go_version: '~1.23'
13+
go_version: '~1.25'
14+
prev_go_version: '~1.24'
1515
CGO_ENABLED: '0'
1616
# Sync with Pipfile and netlify.toml.
1717
python_version: '~3.13'
@@ -142,7 +142,7 @@ jobs:
142142
go-version: '${{ env.prev_go_version }}'
143143

144144
- run: go install lmb.io/vimto@latest
145-
- run: go install gotest.tools/[email protected].0
145+
- run: go install gotest.tools/[email protected].3
146146
- run: sudo apt-get update && sudo apt-get install -y --no-install-recommends qemu-system-x86
147147
- run: sudo chmod 0666 /dev/kvm
148148

@@ -188,7 +188,7 @@ jobs:
188188
with:
189189
go-version: '${{ env.go_version }}'
190190

191-
- run: go install gotest.tools/[email protected].0
191+
- run: go install gotest.tools/[email protected].3
192192

193193
- name: Test
194194
# Skip TestGoarches/loong64 because the GH arm64 Go toolchain seems to be weird.
@@ -234,7 +234,7 @@ jobs:
234234
with:
235235
go-version: '${{ env.go_version }}'
236236

237-
- run: go install gotest.tools/[email protected].0
237+
- run: go install gotest.tools/[email protected].3
238238
- run: go install lmb.io/vimto@latest
239239
- run: sudo apt-get update && sudo apt-get install -y --no-install-recommends qemu-system-x86
240240
- run: sudo chmod 0666 /dev/kvm
@@ -368,7 +368,7 @@ jobs:
368368
with:
369369
go-version: '${{ env.go_version }}'
370370

371-
- run: go install gotest.tools/[email protected].0
371+
- run: go install gotest.tools/[email protected].3
372372

373373
- name: Test
374374
run: >

go.mod

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module github.com/cilium/ebpf
22

3-
go 1.23.0
4-
5-
toolchain go1.24.1
3+
go 1.24
64

75
require (
86
github.com/go-quicktest/qt v1.101.1-0.20240301121107-c6c8733fa1e6

testdata/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This Dockerfile generates a build environment for generating ELFs
22
# of testdata programs. Run `make build` in this directory to build it.
3-
FROM golang:1.23-bullseye
3+
FROM golang:1.25-bookworm
44

55
COPY llvm-snapshot.gpg.key .
66

testdata/docker/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1749554559
1+
1755266860

testdata/docker/llvm.list

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
# Taken from https://apt.llvm.org.
22

3-
deb http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye main
4-
deb-src http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye main
3+
deb http://apt.llvm.org/bookworm/ llvm-toolchain-bookworm main
4+
deb-src http://apt.llvm.org/bookworm/ llvm-toolchain-bookworm main
55

6-
deb http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-14 main
7-
deb-src http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-14 main
6+
deb http://apt.llvm.org/bookworm/ llvm-toolchain-bookworm-17 main
7+
deb-src http://apt.llvm.org/bookworm/ llvm-toolchain-bookworm-17 main
88

9-
deb http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-17 main
10-
deb-src http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-17 main
11-
12-
deb http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-20 main
13-
deb-src http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-20 main
9+
deb http://apt.llvm.org/bookworm/ llvm-toolchain-bookworm-20 main
10+
deb-src http://apt.llvm.org/bookworm/ llvm-toolchain-bookworm-20 main

0 commit comments

Comments
 (0)