Merge branch 'main' into fix-341

jaypipes · May 8, 2023 · f62e6fb · f62e6fb
2 parents 22be3f7 + 159b397
commit f62e6fb
Show file tree

Hide file tree

Showing 2 changed files with 279 additions and 233 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -10,7 +10,7 @@ on:
 jobs:
   # tier 0: system-independent checks
   format:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
       with:
@@ -19,13 +19,13 @@ jobs:
     - name: set up golang
       uses: actions/setup-go@v2
       with:
-        go-version: 1.18
+        go-version: 1.19
 
     - name: format
       run: ./hack/check-format.sh
 
   lint:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
     - name: Check out code
       uses: actions/checkout@v2
@@ -37,7 +37,26 @@ jobs:
         args: --timeout=15m0s --verbose
 
   # tier-1
-  # main development platfotm, gets features first and it's most tested
+  # main development platform, gets features first and it's most tested
+  build-ubuntu-2204:
+    runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        go: [ '1.19', '1.20']
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: set up go
+      uses: actions/setup-go@v2
+      with:
+        go-version: ${{ matrix.go }}
+
+    - name: run unit-tests
+      env:
+        GHW_TESTING_SKIP_BLOCK: "1"
+        GHW_TESTING_SKIP_GPU: "1"
+      run: go test -v ./...
+
   build-ubuntu-2004:
     runs-on: ubuntu-20.04
     strategy:
@@ -57,8 +76,31 @@ jobs:
         GHW_TESTING_SKIP_GPU: "1"
       run: go test -v ./...
 
-  # tier-2
-  # best-effort support, limited to most recent platforms (OS+go)
+  build-windows-2022:
+    runs-on: windows-2022
+    strategy:
+      matrix:
+        go: [ '1.19' ]
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: set up go
+      uses: actions/setup-go@v2
+      with:
+        go-version: ${{ matrix.go }}
+
+    - name: run unit-tests
+      env:
+        GHW_TESTING_SKIP_BLOCK: "1"
+        GHW_TESTING_SKIP_GPU: "1"
+        GHW_TESTING_SKIP_CPU: "1"
+        GHW_TESTING_SKIP_MEMORY: "1"
+        GHW_TESTING_SKIP_HOST: "1"
+        GHW_TESTING_SKIP_NET: "1"
+        GHW_TESTING_SKIP_PCI: "1"
+        GHW_TESTING_SKIP_TOPOLOGY: "1"
+      run: go test -v ./...
+
   build-windows-2019:
     runs-on: windows-2019
     strategy:
@@ -86,9 +128,13 @@ jobs:
 
   # tier-2
   # best-effort support, limited to most recent platforms (OS+go)
-  # TODO: check this is the last on x86, the switch to arm is nontrivial
-  build-macos-1015:
-    runs-on: macos-10.15
+
+  # NOTE(jaypipes): We currently only support block information on MacOS, and
+  # the tests have block skipped because we cannot get meaningful information
+  # about the block devices in the Github Actions Runner virtual machines. So
+  # this is really just a test of whether the library builds on MacOS 12.
+  build-macos-12:
+    runs-on: macos-12
     strategy:
       matrix:
         go: [ '1.18' ]