expand GH action matrix

elastic · May 16, 2023 · 1f4e96d · 1f4e96d
1 parent b49b26a
commit 1f4e96d
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 15 deletions.
diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile
@@ -37,11 +37,11 @@ pipeline {
         axes {
           axis {
             name 'GO_VERSION'
-            values '1.18.10', '1.19.9'
+            values '1.20.4'
           }
           axis {
             name 'PLATFORM'
-            values 'x86_64 && macos10', 'ubuntu-18 && immutable', 'windows-2019 && immutable', 'orka && darwin && x86_64', 'orka && darwin && arm64'
+            values 'ubuntu-18 && immutable', 'orka && darwin && arm64'
           }
           axis {
             name 'CGO_ENABLED'
@@ -51,22 +51,12 @@ pipeline {
         excludes {
           exclude {
             axis {
-              name 'GO_VERSION'
-              values '1.18.10'
+              name 'CGO_ENABLED'
+              values '1'
             }
             axis {
               name 'PLATFORM'
-              values 'orka && darwin && arm64'
-            }
-          }
-          exclude {
-            axis {
-              name 'GO_VERSION'
-              values '1.19.9'
-            }
-            axis {
-              name 'PLATFORM'
-              notValues 'orka && darwin && arm64'
+              values 'ubuntu-18 && immutable'
             }
           }
         }

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -16,6 +16,17 @@ jobs:
           - macos-11
           - macos-12
           - macos-13
+          - windows-2019
+          - windows-2022
+          - ubuntu-20.04
+        cgo:
+          - 0
+          - 1
+      exclude:
+        # Ignore platforms that don't use CGO.
+        - {cgo: 1, os: windows-2019}
+        - {cgo: 1, os: windows-2022}
+        - {cgo: 1, os: ubuntu-20.04}
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
@@ -28,4 +39,9 @@ jobs:
         run: echo "GO_VERSION=${{ matrix.go }}" >> $GITHUB_ENV
 
       - name: Test
+        if: runner.os != 'Windows'
         run:  .ci/scripts/test.sh
+
+      - name: Test
+        if: runner.os == 'Windows'
+        run:  .ci/scripts/test.bat