From 7408350b49c1cfa15a5356f3d34576a088b0adc7 Mon Sep 17 00:00:00 2001 From: Chris Waldon Date: Tue, 13 Dec 2022 10:14:03 -0500 Subject: [PATCH 1/2] deps: declare go 1.18 in go.mod This updates the go.{mod,sum} files to declare a version of Go that supports module graph pruning. The change allows consuming projects to avoid picking up dependencies on modules that ghw only uses for testing or for its CLI. Fixes #328 Signed-off-by: Chris Waldon --- go.mod | 13 ++++++++----- go.sum | 1 - 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 6ffd3e4c..f4e81862 100644 --- a/go.mod +++ b/go.mod @@ -1,20 +1,23 @@ module github.com/jaypipes/ghw -go 1.15 +go 1.18 require ( github.com/StackExchange/wmi v1.2.1 github.com/ghodss/yaml v1.0.0 + github.com/jaypipes/pcidb v1.0.0 + github.com/pkg/errors v0.9.1 + github.com/spf13/cobra v0.0.3 + 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/jaypipes/pcidb v1.0.0 github.com/kr/pretty v0.1.0 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect - github.com/pkg/errors v0.9.1 - github.com/spf13/cobra v0.0.3 github.com/spf13/pflag v1.0.2 // indirect golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8 // indirect gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect - howett.net/plist v1.0.0 ) diff --git a/go.sum b/go.sum index 2d6b4e9e..09de766c 100644 --- a/go.sum +++ b/go.sum @@ -15,7 +15,6 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= From d5c8a98814b397ed4752dde935526487d87ede06 Mon Sep 17 00:00:00 2001 From: Chris Waldon Date: Fri, 23 Dec 2022 09:13:46 -0500 Subject: [PATCH 2/2] ci: bump go versions Signed-off-by: Chris Waldon --- .github/workflows/go.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index b260115a..3aed669b 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -19,7 +19,7 @@ jobs: - name: set up golang uses: actions/setup-go@v2 with: - go-version: 1.17 + go-version: 1.18 - name: format run: ./hack/check-format.sh @@ -42,7 +42,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - go: [ '1.15', '1.16', '1.17' ] + go: [ '1.18', '1.19'] steps: - uses: actions/checkout@v2 @@ -63,7 +63,7 @@ jobs: runs-on: windows-2019 strategy: matrix: - go: [ '1.16' ] + go: [ '1.18' ] steps: - uses: actions/checkout@v2 @@ -91,7 +91,7 @@ jobs: runs-on: macos-10.15 strategy: matrix: - go: [ '1.16' ] + go: [ '1.18' ] steps: - uses: actions/checkout@v2