From d17b9b65f81a8c276d5b78cfdfc10b5ddc2e6185 Mon Sep 17 00:00:00 2001 From: Arthur Fabre Date: Thu, 12 Jun 2025 12:11:13 +0200 Subject: [PATCH 1/2] Update dependencies, require go 1.23 Update cilium/ebpf and golang.org/x dependencies to their latest version. Requrie the oldest supported golang version. --- .github/workflows/test.yml | 2 +- go.mod | 10 ++++------ go.sum | 25 ++++++++++++++----------- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index cdab60b..d56c73a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,7 +14,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v2 with: - go-version: ^1.20 + go-version: ^1.24 - name: Check out code into the Go module directory uses: actions/checkout@v2 diff --git a/go.mod b/go.mod index b4b1dec..6cb59c0 100644 --- a/go.mod +++ b/go.mod @@ -1,12 +1,10 @@ module github.com/cloudflare/cbpfc require ( - github.com/cilium/ebpf v0.11.0 + github.com/cilium/ebpf v0.18.0 github.com/pkg/errors v0.9.1 - golang.org/x/net v0.17.0 - golang.org/x/sys v0.13.0 + golang.org/x/net v0.36.0 + golang.org/x/sys v0.33.0 ) -require golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2 // indirect - -go 1.19 +go 1.23.0 diff --git a/go.sum b/go.sum index ca72fc4..1b6a511 100644 --- a/go.sum +++ b/go.sum @@ -1,15 +1,18 @@ -github.com/cilium/ebpf v0.11.0 h1:V8gS/bTCCjX9uUnkUFUpPsksM8n1lXBAvHcpiFk1X2Y= -github.com/cilium/ebpf v0.11.0/go.mod h1:WE7CZAnqOL2RouJ4f1uyNhqr2P4CCvXFIqdRDUgWsVs= -github.com/frankban/quicktest v1.14.5 h1:dfYrrRyLtiqT9GyKXgdh+k4inNeTvmGbuSgZ3lx3GhA= -github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= +github.com/cilium/ebpf v0.18.0 h1:OsSwqS4y+gQHxaKgg2U/+Fev834kdnsQbtzRnbVC6Gs= +github.com/cilium/ebpf v0.18.0/go.mod h1:vmsAT73y4lW2b4peE+qcOqw6MxvWQdC+LiU5gd/xyo4= +github.com/go-quicktest/qt v1.101.1-0.20240301121107-c6c8733fa1e6 h1:teYtXy9B7y5lHTp8V9KPxpYRAVA7dozigQcMiBust1s= +github.com/go-quicktest/qt v1.101.1-0.20240301121107-c6c8733fa1e6/go.mod h1:p4lGIVX+8Wa6ZPNDvqcxq36XpUDLh42FLetFU7odllI= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= -golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2 h1:Jvc7gsqn21cJHCmAWx0LiimpP18LZmUxkT5Mp7EZ1mI= -golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= -golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= -golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= -golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= +github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= +golang.org/x/net v0.36.0 h1:vWF2fRbw4qslQsQzgFqZff+BItCvGFQqKzKIzx1rmoA= +golang.org/x/net v0.36.0/go.mod h1:bFmbeoIPfrw4sMHNhb4J9f6+tPziuGjq7Jk/38fxi1I= +golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw= +golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= From 50f154abe7c28a0dda1f263a3f1d0a4c85c0324f Mon Sep 17 00:00:00 2001 From: Arthur Fabre Date: Thu, 12 Jun 2025 12:52:30 +0200 Subject: [PATCH 2/2] CI: Ubuntu 22.04, clang 11, 14, and 20 Github actions has dropped support for ubuntu 20.04, switch to 22.04. This doesn't let us easily test clang-9, as it's not packaged either by Ubuntu or apt.llvm.org. But that version is six years old, so it's not worth the hassle of building it ourselves. Use clang 11 (which is packaged by Ubuntu for 22.04, but not 24.04), keep 14, and add the latest version: 20. --- .github/workflows/test.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d56c73a..31efea4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -4,11 +4,11 @@ on: push jobs: test: name: Test clang-${{ matrix.clang }} - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: matrix: - clang: ["9", "14", "16"] + clang: ["11", "14", "20"] steps: - name: Set up Go 1.x @@ -20,11 +20,11 @@ jobs: uses: actions/checkout@v2 - name: Add apt.llvm.org repo - # clang-9 is in the upstream focal repo, but not apt.llvm.org. - if: matrix.clang != 9 + # clang-11 is in the upstream jammy repo, but not apt.llvm.org. + if: matrix.clang != 11 run: | wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key 2>/dev/null | sudo apt-key add - - echo 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-${{ matrix.clang }} main' | sudo tee /etc/apt/sources.list.d/clang.list + echo 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-${{ matrix.clang }} main' | sudo tee /etc/apt/sources.list.d/clang.list # Only update the llvm repo, this is a lot faster. sudo apt-get update -o Dir::Etc::sourcelist="sources.list.d/clang.list" -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0"