From 3f262a0364b9e12463bc0a467ee0d3cd89be5c97 Mon Sep 17 00:00:00 2001 From: nickgarlis Date: Sat, 28 Feb 2026 16:41:31 +0100 Subject: [PATCH] Update dependencies and Go version to 1.26 Includes updates to several libraries, including github.com/mdlayher/netlink, which has some relevant improvements (mainly performance): - https://github.com/mdlayher/netlink/blob/main/CHANGELOG.md#v1112 - https://github.com/mdlayher/netlink/blob/main/CHANGELOG.md#v1111 - https://github.com/mdlayher/netlink/blob/main/CHANGELOG.md#v1110 - https://github.com/mdlayher/netlink/blob/main/CHANGELOG.md#v1100 --- .github/workflows/push.yml | 51 +++++++++++++++++++------------------- go.mod | 16 ++++++------ go.sum | 36 +++++++++++---------------- 3 files changed, 47 insertions(+), 56 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 471411da..23cdefda 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -2,36 +2,35 @@ name: Push on: push: - branches: [ main ] + branches: [main] pull_request: - branches: [ main ] + branches: [main] -jobs: +permissions: + contents: read +jobs: build: name: CI runs-on: ubuntu-latest steps: - - - uses: actions/checkout@v3 - - - name: Set up Go 1.x - uses: actions/setup-go@v4 - with: - # Run on the latest minor release of Go 1.20: - go-version: ^1.20 - id: go - - - - name: Ensure all files were formatted as per gofmt - run: | - [ "$(gofmt -l $(find . -name '*.go') 2>&1)" = "" ] - - - name: Run tests - run: | - go vet . - go test ./... - go test -c github.com/google/nftables - sudo ./nftables.test -test.v -run_system_tests - go test -c github.com/google/nftables/integration - (cd integration && sudo ../integration.test -test.v -run_system_tests) + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 + + - name: Set up Go + uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7.0.0 + with: + go-version: ^1.26 + id: go + + - name: Ensure all files were formatted as per gofmt + run: | + [ "$(gofmt -l $(find . -name '*.go') 2>&1)" = "" ] + + - name: Run tests + run: | + go vet . + go test ./... + go test -c github.com/google/nftables + sudo ./nftables.test -test.v -run_system_tests + go test -c github.com/google/nftables/integration + (cd integration && sudo ../integration.test -test.v -run_system_tests) diff --git a/go.mod b/go.mod index c862aa13..504d2790 100644 --- a/go.mod +++ b/go.mod @@ -1,17 +1,17 @@ module github.com/google/nftables -go 1.23.0 +go 1.26.0 require ( github.com/google/go-cmp v0.7.0 - github.com/mdlayher/netlink v1.8.1-0.20251028132421-dcc6cab9a6eb - github.com/vishvananda/netlink v1.3.0 - github.com/vishvananda/netns v0.0.4 - golang.org/x/sys v0.35.0 + github.com/mdlayher/netlink v1.11.2 + github.com/vishvananda/netlink v1.3.1 + github.com/vishvananda/netns v0.0.5 + golang.org/x/sys v0.43.0 ) require ( - github.com/mdlayher/socket v0.5.1 // indirect - golang.org/x/net v0.43.0 // indirect - golang.org/x/sync v0.6.0 // indirect + github.com/mdlayher/socket v0.6.0 // indirect + golang.org/x/net v0.53.0 // indirect + golang.org/x/sync v0.20.0 // indirect ) diff --git a/go.sum b/go.sum index a61228bc..23625e7d 100644 --- a/go.sum +++ b/go.sum @@ -1,26 +1,18 @@ -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/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= -github.com/mdlayher/netlink v1.7.3-0.20250702063131-0f7746f74615 h1:5T2ai+PpYFKe+tyNj/ZxePZGiYoG5xDOylT30nywJUU= -github.com/mdlayher/netlink v1.7.3-0.20250702063131-0f7746f74615/go.mod h1:ZlWrPUV9wyD64k5skWrIv4WDQmmiUbkNnCkBtEWYKwU= -github.com/mdlayher/netlink v1.8.1-0.20251028132421-dcc6cab9a6eb h1:DksQ+rxoqmUG32L6R1IbDH43i/Z9CpwBT6mSc9D9mXs= -github.com/mdlayher/netlink v1.8.1-0.20251028132421-dcc6cab9a6eb/go.mod h1:JVS396/XsyadqrXigRedyb1Q7yEfSq95lheQxgyQ6xA= -github.com/mdlayher/socket v0.5.1 h1:VZaqt6RkGkt2OE9l3GcC6nZkqD3xKeQLyfleW/uBcos= -github.com/mdlayher/socket v0.5.1/go.mod h1:TjPLHI1UgwEv5J1B5q0zTZq12A/6H7nKmtTanQE37IQ= -github.com/vishvananda/netlink v1.3.0 h1:X7l42GfcV4S6E4vHTsw48qbrV+9PVojNfIhZcwQdrZk= -github.com/vishvananda/netlink v1.3.0/go.mod h1:i6NetklAujEcC6fK0JPjT8qSwWyO0HLn4UKG+hGqeJs= -github.com/vishvananda/netns v0.0.4 h1:Oeaw1EM2JMxD51g9uhtC0D7erkIjgmj8+JZc26m1YX8= -github.com/vishvananda/netns v0.0.4/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM= -golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8= -golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8= -golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE= -golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg= -golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= -golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +github.com/mdlayher/netlink v1.11.2 h1:HKh2jqe+omdSWcQ88nrT7INE61B0NXfiSPFdgL4YbNI= +github.com/mdlayher/netlink v1.11.2/go.mod h1:uT2Yc/QLaZubzDpZIBi9d4GoeLwtp3x1AMeqSRrK2sA= +github.com/mdlayher/socket v0.6.0 h1:ScZPaAGyO1icQnbFrhPM8mnXyMu9qukC1K4ZoM2IQKU= +github.com/mdlayher/socket v0.6.0/go.mod h1:q7vozUAnxSqnjHc12Fik5yUKIzfZ8ITCfMkhOtE9z18= +github.com/vishvananda/netlink v1.3.1 h1:3AEMt62VKqz90r0tmNhog0r/PpWKmrEShJU0wJW6bV0= +github.com/vishvananda/netlink v1.3.1/go.mod h1:ARtKouGSTGchR8aMwmkzC0qiNPrrWO5JS/XMVl45+b4= +github.com/vishvananda/netns v0.0.5 h1:DfiHV+j8bA32MFM7bfEunvT8IAqQ/NzSJHtcmW5zdEY= +github.com/vishvananda/netns v0.0.5/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM= +golang.org/x/net v0.53.0 h1:d+qAbo5L0orcWAr0a9JweQpjXF19LMXJE8Ey7hwOdUA= +golang.org/x/net v0.53.0/go.mod h1:JvMuJH7rrdiCfbeHoo3fCQU24Lf5JJwT9W3sJFulfgs= +golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4= +golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik= -golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= -golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI= -golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= +golang.org/x/sys v0.43.0 h1:Rlag2XtaFTxp19wS8MXlJwTvoh8ArU6ezoyFsMyCTNI= +golang.org/x/sys v0.43.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=