Updated github workflows

iand · Nov 25, 2023 · 86f79dc · 86f79dc
1 parent 0b61394
commit 86f79dc
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 11 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -8,11 +8,8 @@ on:
       - master
 name: Run tests
 jobs:
-  test:
-    strategy:
-      matrix:
-        os: ["ubuntu", "windows", "macos"]
-    runs-on: ${{ matrix.os }}-latest
+  check:
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -25,11 +22,9 @@ jobs:
           go-version-file: 'go.mod'
 
       - name: Get StaticCheck
-        if: ${{ matrix.os == 'ubuntu' }}
         run: go install honnef.co/go/tools/cmd/staticcheck@latest
 
       - name: Gomod
-        if: ${{ matrix.os == 'ubuntu' }}
         run: |
           go mod tidy
           if [[ -n $(git ls-files --other --exclude-standard --directory -- go.sum) ]]; then
@@ -39,7 +34,7 @@ jobs:
           git diff --exit-code -- go.sum go.mod
 
       - name: Gofmt
-        if: ${{ matrix.os == 'ubuntu' && (success() || failure()) }} # run this step even if the previous one failed
+        if: ${{ success() || failure() }} # run this step even if the previous one failed
         run: |
           out=$(gofmt -s -l .)
           if [[ -n "$out" ]]; then
@@ -48,13 +43,29 @@ jobs:
           fi
 
       - name: Vet
-        if: ${{ matrix.os == 'ubuntu' && (success() || failure()) }} # run this step even if the previous one failed
+        if: ${{ success() || failure() }} # run this step even if the previous one failed
         run: go vet ./...
 
       - name: StaticCheck
-        if: ${{ matrix.os == 'ubuntu' && (success() || failure()) }} # run this step even if the previous one failed
+        if: ${{ success() || failure() }} # run this step even if the previous one failed
         run: staticcheck ./...
 
+  test:
+    strategy:
+      matrix:
+        os: ["ubuntu", "windows", "macos"]
+    runs-on: ${{ matrix.os }}-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Install Go
+        uses: actions/setup-go@v4
+        with:
+          go-version-file: 'go.mod'
+
       - name: Test
         run: go test ./...
 

diff --git a/.github/workflows/version.yml b/.github/workflows/version.yml
@@ -5,9 +5,12 @@ on:
     workflows: ["Run tests"]
     types:
       - completed
+    branches:
+      - main
+      - master
 
 jobs:
-  build:
+  version:
     runs-on: ubuntu-latest
     if: ${{ github.event.workflow_run.conclusion == 'success' }}
     steps: