Go: update go-tests-other-os.yml

redsun82 · redsun82 · commit d66494dcb0b2 · 2024-04-26T17:03:56.000+02:00
diff --git a/.github/workflows/go-tests-other-os.yml b/.github/workflows/go-tests-other-os.yml
@@ -7,64 +7,38 @@ on:
       - .github/workflows/go-tests-other-os.yml
       - .github/actions/**
       - codeql-workspace.yml
-env:
-  GO_VERSION: '~1.22.0'
 
 permissions:
   contents: read
 
 jobs:
-  test-mac:
-    name: Test MacOS
-    runs-on: macos-latest
+  test:
+    name: Test
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [macos-latest, windows-latest-xl]
+    if: matrix.os == 'macos-latest' || github.repository_owner == 'github'
+    runs-on: ${{ matrix.os }}
     steps:
-      - name: Set up Go ${{ env.GO_VERSION }}
-        uses: actions/setup-go@v5
-        with:
-          go-version: ${{ env.GO_VERSION }}
-          cache: false
-        id: go
-
       - name: Check out code
         uses: actions/checkout@v4
 
-      - name: Set up CodeQL CLI
-        uses: ./.github/actions/fetch-codeql
-
-      - name: Enable problem matchers in repository
+      - name: Get go version
         shell: bash
-        run: 'find .github/problem-matchers -name \*.json -exec echo "::add-matcher::{}" \;'
-
-      - name: Build
-        run: |
-          cd go
-          make
-
-      - name: Cache compilation cache
-        id: query-cache
-        uses: ./.github/actions/cache-query-compilation
-        with:
-          key: go-qltest
-      - name: Test
         run: |
-          cd go
-          make test cache="${{ steps.query-cache.outputs.cache-dir }}"
+          (
+            echo -n "GO_VERSION="
+            bazel run @rules_go//go -- version | sed 's/go version go\(\S*\) .*/\1/'
+          ) | tee -a "$GITHUB_ENV"
 
-  test-win:
-    if: github.repository_owner == 'github'
-    name: Test Windows
-    runs-on: windows-latest-xl
-    steps:
-      - name: Set up Go ${{ env.GO_VERSION }}
+      - name: Set up Go
         uses: actions/setup-go@v5
         with:
           go-version: ${{ env.GO_VERSION }}
           cache: false
         id: go
 
-      - name: Check out code
-        uses: actions/checkout@v4
-
       - name: Set up CodeQL CLI
         uses: ./.github/actions/fetch-codeql
 
@@ -74,15 +48,13 @@ jobs:
 
       - name: Build
         run: |
-          cd go
-          make
+          bazel run //go:create-extractor-pack
 
       - name: Cache compilation cache
         id: query-cache
         uses: ./.github/actions/cache-query-compilation
         with:
           key: go-qltest
-
       - name: Test
         run: |
           cd go
