Merge pull request #290 from fromanirh/update-toolchain

toolchain update
jaypipes · Nov 23, 2021 · b1b38be · b1b38be
2 parents 004673d + e90cb81
commit b1b38be
Show file tree

Hide file tree

Showing 19 changed files with 35 additions and 4 deletions.
diff --git 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.16
+        go-version: 1.17
 
     - name: format
       run: ./hack/check-format.sh
@@ -42,7 +42,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        go: [ '1.14', '1.15', '1.16' ]
+        go: [ '1.15', '1.16', '1.17' ]
     steps:
     - uses: actions/checkout@v2
 
@@ -91,7 +91,7 @@ jobs:
     runs-on: macos-10.15
     strategy:
       matrix:
-        go: [ '1.15' ]  # TODO: no 1.16 atm
+        go: [ '1.16' ]
     steps:
     - uses: actions/checkout@v2
 

diff --git a/cmd/ghw-snapshot/main.go b/cmd/ghw-snapshot/main.go
@@ -1,4 +1,6 @@
+//go:build linux
 // +build linux
+
 //
 // Use and distribution licensed under the Apache license version 2.
 //

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/jaypipes/ghw
 
-go 1.12
+go 1.15
 
 require (
 	github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d

diff --git a/pkg/baseboard/baseboard_stub.go b/pkg/baseboard/baseboard_stub.go
@@ -1,4 +1,6 @@
+//go:build !linux && !windows
 // +build !linux,!windows
+
 // Use and distribution licensed under the Apache license version 2.
 //
 // See the COPYING file in the root project directory for full text.

diff --git a/pkg/bios/bios_stub.go b/pkg/bios/bios_stub.go
@@ -1,4 +1,6 @@
+//go:build !linux && !windows
 // +build !linux,!windows
+
 // Use and distribution licensed under the Apache license version 2.
 //
 // See the COPYING file in the root project directory for full text.

diff --git a/pkg/block/block_linux_test.go b/pkg/block/block_linux_test.go
@@ -4,6 +4,7 @@
 // See the COPYING file in the root project directory for full text.
 //
 
+//go:build linux
 // +build linux
 
 package block

diff --git a/pkg/block/block_stub.go b/pkg/block/block_stub.go
@@ -1,4 +1,6 @@
+//go:build !linux && !darwin && !windows
 // +build !linux,!darwin,!windows
+
 // Use and distribution licensed under the Apache license version 2.
 //
 // See the COPYING file in the root project directory for full text.

diff --git a/pkg/chassis/chassis_stub.go b/pkg/chassis/chassis_stub.go
@@ -1,4 +1,6 @@
+//go:build !linux && !windows
 // +build !linux,!windows
+
 // Use and distribution licensed under the Apache license version 2.
 //
 // See the COPYING file in the root project directory for full text.

diff --git a/pkg/cpu/cpu_stub.go b/pkg/cpu/cpu_stub.go
@@ -1,4 +1,6 @@
+//go:build !linux && !windows
 // +build !linux,!windows
+
 // Use and distribution licensed under the Apache license version 2.
 //
 // See the COPYING file in the root project directory for full text.

diff --git a/pkg/cpu/cpu_windows.go b/pkg/cpu/cpu_windows.go
@@ -1,4 +1,6 @@
+//go:build !linux
 // +build !linux
+
 // Use and distribution licensed under the Apache license version 2.
 //
 // See the COPYING file in the root project directory for full text.

diff --git a/pkg/gpu/gpu_stub.go b/pkg/gpu/gpu_stub.go
@@ -1,4 +1,6 @@
+//go:build !linux && !windows
 // +build !linux,!windows
+
 // Use and distribution licensed under the Apache license version 2.
 //
 // See the COPYING file in the root project directory for full text.

diff --git a/pkg/linuxpath/path_linux_test.go b/pkg/linuxpath/path_linux_test.go
@@ -4,6 +4,7 @@
 // See the COPYING file in the root project directory for full text.
 //
 
+//go:build linux
 // +build linux
 
 package linuxpath_test

diff --git a/pkg/memory/memory_stub.go b/pkg/memory/memory_stub.go
@@ -1,4 +1,6 @@
+//go:build !linux && !windows
 // +build !linux,!windows
+
 // Use and distribution licensed under the Apache license version 2.
 //
 // See the COPYING file in the root project directory for full text.

diff --git a/pkg/net/net_linux_test.go b/pkg/net/net_linux_test.go
@@ -4,6 +4,7 @@
 // See the COPYING file in the root project directory for full text.
 //
 
+//go:build linux
 // +build linux
 
 package net

diff --git a/pkg/net/net_stub.go b/pkg/net/net_stub.go
@@ -1,4 +1,6 @@
+//go:build !linux && !windows
 // +build !linux,!windows
+
 // Use and distribution licensed under the Apache license version 2.
 //
 // See the COPYING file in the root project directory for full text.

diff --git a/pkg/pci/pci_stub.go b/pkg/pci/pci_stub.go
@@ -1,4 +1,6 @@
+//go:build !linux
 // +build !linux
+
 // Use and distribution licensed under the Apache license version 2.
 //
 // See the COPYING file in the root project directory for full text.

diff --git a/pkg/product/product_stub.go b/pkg/product/product_stub.go
@@ -1,4 +1,6 @@
+//go:build !linux && !windows
 // +build !linux,!windows
+
 // Use and distribution licensed under the Apache license version 2.
 //
 // See the COPYING file in the root project directory for full text.

diff --git a/pkg/snapshot/clonetree_stub.go b/pkg/snapshot/clonetree_stub.go
@@ -1,4 +1,6 @@
+//go:build !linux
 // +build !linux
+
 //
 // Use and distribution licensed under the Apache license version 2.
 //

diff --git a/pkg/topology/topology_stub.go b/pkg/topology/topology_stub.go
@@ -1,4 +1,6 @@
+//go:build !linux && !windows
 // +build !linux,!windows
+
 // Use and distribution licensed under the Apache license version 2.
 //
 // See the COPYING file in the root project directory for full text.