Unify PR and main workflows

* Also add more Go versions to test Signed-off-by: Nicolas Bock <[email protected]>
canonical · Aug 25, 2023 · 4b8138a · 4b8138a
1 parent 3352cc1
commit 4b8138a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 25 deletions.
diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml
diff --git a/.github/workflows/main-branch.yml → .github/workflows/test-and-build.yaml b/.github/workflows/main-branch.yml → .github/workflows/test-and-build.yaml
@@ -2,21 +2,24 @@ on:
   push:
     branches:
       - main
+  pull_request:
+    branches:
+      - main
+
 name: Tests/Jobs for main branch merges
 jobs:
   test:
     strategy:
       matrix:
-        go-version: [ 1.16.x ]
+        go-version: [ 1.16, 1.17, 1.18 ]
         os: [ ubuntu-latest ]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Install Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v4
         with:
           go-version: ${{ matrix.go-version }}
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Test and Build
         run: make all
-