Merge branch 'v1.x.x' into test/pact-2.0.1

.github/workflows/golangci-lint.yml

@@ -2,28 +2,31 @@ name: golangci-lint
 on:
   push:
     tags:
-      - v1*
+      - v2*
     branches:
-      - v1.x.x
+      - master
+      - main
   pull_request:
 jobs:
   golangci:
     name: lint
     strategy:
+      fail-fast: false
       matrix:
         go-version: [
                 1.17.x, 
-                # 1.18.x
+                1.18.x,
+                1.19.x
                 ]
         os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
       - name: Install Go
         uses: actions/setup-go@v4
         with:
           go-version: ${{ matrix.go-version }}
-      - name: Checkout code
-        uses: actions/checkout@v3
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with: