diff --git a/.github/workflows/linux-integration-test.yml b/.github/workflows/linux-integration-test.yml index bb06d3f..b29e7f1 100644 --- a/.github/workflows/linux-integration-test.yml +++ b/.github/workflows/linux-integration-test.yml @@ -12,7 +12,7 @@ jobs: build: strategy: matrix: - go-version: ["1.18", "1.19", "1.20"] + go-version: ["1.21", "1.22", "1.23"] runs-on: ubuntu-latest steps: diff --git a/.github/workflows/linux-test.yml b/.github/workflows/linux-test.yml index 2e963e3..aa7f76b 100644 --- a/.github/workflows/linux-test.yml +++ b/.github/workflows/linux-test.yml @@ -12,7 +12,7 @@ jobs: build: strategy: matrix: - go-version: ["1.18", "1.19", "1.20"] + go-version: ["1.21", "1.22", "1.23"] runs-on: ubuntu-latest steps: diff --git a/.github/workflows/macos-test.yml b/.github/workflows/macos-test.yml index 8765576..c305b13 100644 --- a/.github/workflows/macos-test.yml +++ b/.github/workflows/macos-test.yml @@ -12,7 +12,7 @@ jobs: build: strategy: matrix: - go-version: ["1.20"] + go-version: ["1.23"] runs-on: macos-latest steps: diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index 3c4312d..319eeea 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -12,7 +12,7 @@ jobs: build: strategy: matrix: - go-version: ["1.20"] + go-version: ["1.23"] runs-on: ubuntu-latest steps: diff --git a/attribute.go b/attribute.go index 4d3cfd3..1c81c32 100644 --- a/attribute.go +++ b/attribute.go @@ -6,7 +6,6 @@ import ( "fmt" "math" - "github.com/josharian/native" "github.com/mdlayher/netlink/nlenc" ) @@ -168,7 +167,7 @@ type AttributeDecoder struct { func NewAttributeDecoder(b []byte) (*AttributeDecoder, error) { ad := &AttributeDecoder{ // By default, use native byte order. - ByteOrder: native.Endian, + ByteOrder: binary.NativeEndian, b: b, } @@ -485,7 +484,7 @@ type AttributeEncoder struct { // NewAttributeEncoder creates an AttributeEncoder that encodes Attributes. func NewAttributeEncoder() *AttributeEncoder { - return &AttributeEncoder{ByteOrder: native.Endian} + return &AttributeEncoder{ByteOrder: binary.NativeEndian} } // Uint8 encodes uint8 data into an Attribute specified by typ. diff --git a/attribute_test.go b/attribute_test.go index be02357..4a05a5d 100644 --- a/attribute_test.go +++ b/attribute_test.go @@ -10,7 +10,6 @@ import ( "unsafe" "github.com/google/go-cmp/cmp" - "github.com/josharian/native" "github.com/mdlayher/netlink/nlenc" ) @@ -565,8 +564,8 @@ func TestAttributeDecoderOK(t *testing.T) { }, { name: "uint-int native endian", - attrs: adEndianAttrs(native.Endian), - fn: adEndianTest(native.Endian), + attrs: adEndianAttrs(binary.NativeEndian), + fn: adEndianTest(binary.NativeEndian), }, { name: "uint-int little endian", @@ -1017,8 +1016,8 @@ func TestAttributeEncoderOK(t *testing.T) { }, { name: "uint-int native endian", - attrs: adEndianAttrs(native.Endian), - fn: aeEndianTest(native.Endian), + attrs: adEndianAttrs(binary.NativeEndian), + fn: aeEndianTest(binary.NativeEndian), }, { name: "uint-int little endian", diff --git a/conn_linux_error_test.go b/conn_linux_error_test.go index 2eeb677..97e6227 100644 --- a/conn_linux_error_test.go +++ b/conn_linux_error_test.go @@ -9,7 +9,6 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/josharian/native" "github.com/mdlayher/netlink" "github.com/mdlayher/netlink/nltest" "golang.org/x/sys/unix" @@ -116,7 +115,7 @@ func TestConnReceiveErrorLinux(t *testing.T) { } func skipBigEndian(t *testing.T) { - if binary.ByteOrder(native.Endian) == binary.BigEndian { + if binary.ByteOrder(binary.NativeEndian) == binary.BigEndian { t.Skip("skipping test on big-endian system") } } diff --git a/go.mod b/go.mod index 9268e67..e995c78 100644 --- a/go.mod +++ b/go.mod @@ -1,10 +1,9 @@ module github.com/mdlayher/netlink -go 1.18 +go 1.21 require ( github.com/google/go-cmp v0.5.9 - github.com/josharian/native v1.1.0 github.com/mdlayher/socket v0.4.1 golang.org/x/net v0.9.0 golang.org/x/sys v0.7.0 diff --git a/go.sum b/go.sum index 7c6d471..0015f3d 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,5 @@ github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/josharian/native v1.1.0 h1:uuaP0hAbW7Y4l0ZRQ6C9zfb7Mg1mbFKry/xzDAfmtLA= -github.com/josharian/native v1.1.0/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w= github.com/mdlayher/socket v0.4.1 h1:eM9y2/jlbs1M615oshPQOHZzj6R6wMT7bX5NPiQvn2U= github.com/mdlayher/socket v0.4.1/go.mod h1:cAqeGjoufqdxWkD7DkpyS+wcefOtmu5OQ8KuoJGIReA= golang.org/x/net v0.9.0 h1:aWJ/m6xSmxWBx+V0XRHTlrYrPG56jKsLdTFmsSsCzOM= diff --git a/internal/integration/go.mod b/internal/integration/go.mod index cadc049..710c5c9 100644 --- a/internal/integration/go.mod +++ b/internal/integration/go.mod @@ -1,6 +1,6 @@ module github.com/mdlayher/netlink/internal/integration -go 1.18 +go 1.21 require ( github.com/google/go-cmp v0.5.9 diff --git a/internal/integration/go.sum b/internal/integration/go.sum index 3aa9867..2fcd846 100644 --- a/internal/integration/go.sum +++ b/internal/integration/go.sum @@ -1,4 +1,5 @@ github.com/cilium/ebpf v0.10.0 h1:nk5HPMeoBXtOzbkZBWym+ZWq1GIiHUsBFXxwewXAHLQ= +github.com/cilium/ebpf v0.10.0/go.mod h1:DPiVdY/kT534dgc9ERmvP8mWA+9gvwgKfRvk4nNWnoE= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/josharian/native v1.1.0 h1:uuaP0hAbW7Y4l0ZRQ6C9zfb7Mg1mbFKry/xzDAfmtLA= diff --git a/message_test.go b/message_test.go index cdae68b..7a4b08d 100644 --- a/message_test.go +++ b/message_test.go @@ -6,8 +6,6 @@ import ( "errors" "reflect" "testing" - - "github.com/josharian/native" ) func TestHeaderFlagsString(t *testing.T) { @@ -476,7 +474,7 @@ func TestValidate(t *testing.T) { } func skipBigEndian(t *testing.T) { - if binary.ByteOrder(native.Endian) == binary.BigEndian { + if binary.ByteOrder(binary.NativeEndian) == binary.BigEndian { t.Skip("skipping test on big-endian system") } } diff --git a/nlenc/doc.go b/nlenc/doc.go index 3b42119..990d12e 100644 --- a/nlenc/doc.go +++ b/nlenc/doc.go @@ -4,12 +4,10 @@ package nlenc import ( "encoding/binary" - - "github.com/josharian/native" ) // NativeEndian returns the native byte order of this system. func NativeEndian() binary.ByteOrder { // TODO(mdlayher): consider deprecating and removing this function for v2. - return native.Endian + return binary.NativeEndian } diff --git a/nltest/nltest_test.go b/nltest/nltest_test.go index 06548b3..3e251ac 100644 --- a/nltest/nltest_test.go +++ b/nltest/nltest_test.go @@ -9,7 +9,6 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/josharian/native" "github.com/mdlayher/netlink" "github.com/mdlayher/netlink/nltest" ) @@ -538,7 +537,7 @@ var noop = func(req []netlink.Message) ([]netlink.Message, error) { } func skipBigEndian(t *testing.T) { - if binary.ByteOrder(native.Endian) == binary.BigEndian { + if binary.ByteOrder(binary.NativeEndian) == binary.BigEndian { t.Skip("skipping test on big-endian system") } }