diff --git a/.github/workflows/fmtcheck.yml b/.github/workflows/fmtcheck.yml index 4af89409..4b7fabf0 100644 --- a/.github/workflows/fmtcheck.yml +++ b/.github/workflows/fmtcheck.yml @@ -22,6 +22,7 @@ jobs: github.com:443 api.github.com:443 proxy.github.com:443 + proxy.golang.org:443 raw.githubusercontent.com:443 objects.githubusercontent.com:443 proxy.golang.org:443 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index dcb6451e..73d01375 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -23,6 +23,7 @@ jobs: github.com:443 api.github.com:443 proxy.github.com:443 + proxy.golang.org:443 raw.githubusercontent.com:443 objects.githubusercontent.com:443 proxy.golang.org:443 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index cd4e9fc3..6ca2a7e6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -28,6 +28,7 @@ jobs: github.com:443 api.github.com:443 proxy.github.com:443 + proxy.golang.org:443 raw.githubusercontent.com:443 objects.githubusercontent.com:443 proxy.golang.org:443 @@ -58,6 +59,7 @@ jobs: github.com:443 api.github.com:443 proxy.github.com:443 + proxy.golang.org:443 raw.githubusercontent.com:443 objects.githubusercontent.com:443 proxy.golang.org:443 @@ -88,6 +90,7 @@ jobs: github.com:443 api.github.com:443 proxy.github.com:443 + proxy.golang.org:443 raw.githubusercontent.com:443 objects.githubusercontent.com:443 proxy.golang.org:443 @@ -124,6 +127,7 @@ jobs: github.com:443 api.github.com:443 proxy.github.com:443 + proxy.golang.org:443 raw.githubusercontent.com:443 objects.githubusercontent.com:443 proxy.golang.org:443 @@ -167,6 +171,7 @@ jobs: github.com:443 api.github.com:443 proxy.github.com:443 + proxy.golang.org:443 raw.githubusercontent.com:443 objects.githubusercontent.com:443 proxy.golang.org:443 diff --git a/Dockerfile b/Dockerfile index c81352b3..ee5d2761 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.19-buster as builder +FROM golang:1.21-buster as builder WORKDIR /go/src/github.com/jaypipes/ghw ENV GOPROXY=direct diff --git a/go.mod b/go.mod index f315f115..f52637a5 100644 --- a/go.mod +++ b/go.mod @@ -1,22 +1,22 @@ module github.com/jaypipes/ghw -go 1.19 +go 1.21 require ( github.com/StackExchange/wmi v1.2.1 - github.com/jaypipes/pcidb v1.0.0 + github.com/jaypipes/pcidb v1.0.1 github.com/pkg/errors v0.9.1 - github.com/spf13/cobra v0.0.3 + github.com/spf13/cobra v1.8.0 gopkg.in/yaml.v3 v3.0.1 howett.net/plist v1.0.0 ) require ( github.com/go-ole/go-ole v1.2.6 // indirect - github.com/inconshreveable/mousetrap v1.0.0 // indirect + github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/kr/pretty v0.1.0 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect - github.com/spf13/pflag v1.0.2 // indirect + github.com/spf13/pflag v1.0.5 // indirect golang.org/x/sys v0.1.0 // indirect gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect ) diff --git a/go.sum b/go.sum index 40a5d19c..cc122227 100644 --- a/go.sum +++ b/go.sum @@ -1,12 +1,13 @@ github.com/StackExchange/wmi v1.2.1 h1:VIkavFPXSjcnS+O8yTq7NI32k0R5Aj+v39y29VYDOSA= github.com/StackExchange/wmi v1.2.1/go.mod h1:rcmrprowKIVzvc+NUiLncP2uuArMWLCbu9SBzvHz7e8= +github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= -github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= -github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/jaypipes/pcidb v1.0.0 h1:vtZIfkiCUE42oYbJS0TAq9XSfSmcsgo9IdxSm9qzYU8= -github.com/jaypipes/pcidb v1.0.0/go.mod h1:TnYUvqhPBzCKnH34KrIX22kAeEbDCSRJ9cqLRCuNDfk= +github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= +github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= +github.com/jaypipes/pcidb v1.0.1 h1:WB2zh27T3nwg8AE8ei81sNRb9yWBii3JGNJtT7K9Oic= +github.com/jaypipes/pcidb v1.0.1/go.mod h1:6xYUz/yYEyOkIkUt2t2J2folIuZ4Yg6uByCGFXMCeE4= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= @@ -17,10 +18,11 @@ github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/spf13/cobra v0.0.3 h1:ZlrZ4XsMRm04Fr5pSFxBgfND2EBVa1nLpiy1stUsX/8= -github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= -github.com/spf13/pflag v1.0.2 h1:Fy0orTDgHdbnzHcsOgfCN4LtHf0ec3wwtiwJqwvf3Gc= -github.com/spf13/pflag v1.0.2/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0= +github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho= +github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= +github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=