From 67ce8d9bcb2ff854594ab4d6b6ecd15202495999 Mon Sep 17 00:00:00 2001
From: PapaCharlie <paul.chesnais@gmail.com>
Date: Fri, 2 Feb 2024 15:09:15 -0800
Subject: [PATCH] Fix linter and integration test actions

---
 .github/workflows/integration.yaml | 18 +++++++++++-------
 .github/workflows/lint.yaml        | 20 ++++++++++++++++----
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml
index b43a115a..37c57874 100644
--- a/.github/workflows/integration.yaml
+++ b/.github/workflows/integration.yaml
@@ -1,20 +1,24 @@
 name: integration_test
-on: [push, pull_request]
+
+on:
+push:
+  branches:
+    - master
+pull_request:
 
 jobs:
   integration_test:
     name: integration_test
     strategy:
       matrix:
-        zk-version: [3.5.8, 3.6.3]
-        go-version: [1.21.6]
+        zk-version: ["3.5.8", "3.6.3"]
+        go-version: ["1.21"]
     runs-on: ubuntu-latest
     steps:
-      - name: Go ${{ matrix.go }} setup
+      - name: Go ${{ matrix.go-version }} setup
         uses: actions/setup-go@v4
         with:
-            go-version: ${{ matrix.go-version }} 
-
+            go-version: ${{ matrix.go-version }}
       - name: Setup Java 14
         uses: actions/setup-java@v3
         with:
@@ -22,7 +26,7 @@ jobs:
           java-version: 14
 
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Test code
         run: make test ZK_VERSION=${{ matrix.zk-version }}
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index f7fbef8a..c01c62b5 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -1,12 +1,24 @@
-
 name: lint
-on: [pull_request]
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
 jobs:
   lint:
     name: lint
+    strategy:
+      matrix:
+        go-version: ["1.21"]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v1
+        uses: actions/checkout@v4
+      - name: Install go
+        uses: actions/setup-go@v4
+        with:
+          go-version: ${{ matrix.go-version }}
       - name: Lint code
-        uses: reviewdog/action-golangci-lint@v2
+        uses: golangci/golangci-lint-action@v3