Merge remote-tracking branch 'origin/master' into pc/hp

.github/workflows/unittest.yaml → .github/workflows/integration.yaml

@@ -1,27 +1,28 @@
-name: unittest
+name: integration_test
 on: [push, pull_request]
 
 jobs:
-  unittest:
-    name: unittest
+  integration_test:
+    name: integration_test
     strategy:
       matrix:
-        zk-version: [3.5.8, 3.6.1]
-        go-version: [1.13.x, 1.14.x]
+        zk-version: [3.5.8, 3.6.3]
+        go-version: ['oldstable', 'stable']
     runs-on: ubuntu-latest
     steps:
-      - name: Setup Go
-        uses: actions/setup-go@v1
+      - name: Go ${{ matrix.go }} setup
+        uses: actions/setup-go@v4
         with:
             go-version: ${{ matrix.go-version }} 
 
-      - name: Setup Java
-        uses: actions/setup-java@v1
+      - name: Setup Java 14
+        uses: actions/setup-java@v3
         with:
+          distribution: 'zulu'
           java-version: 14
 
       - name: Checkout code
-        uses: actions/checkout@v1
+        uses: actions/checkout@v3
 
       - name: Test code
         run: make test ZK_VERSION=${{ matrix.zk-version }}

README.md

@@ -1,9 +1,9 @@
 Native Go Zookeeper Client Library
 ===================================
 
-[![GoDoc](https://godoc.org/github.com/go-zookeeper/zk?status.svg)](https://godoc.org/github.com/go-zookeeper/zk)
-[![Build Status](https://img.shields.io/github/workflow/status/go-zookeeper/zk/unittest/master)](https://github.com/go-zookeeper/zk/actions?query=branch%3Amaster)
-[![Coverage Status](https://img.shields.io/codecov/c/github/go-zookeeper/zk/master)](https://codecov.io/gh/go-zookeeper/zk/branch/master)
+[![GoDoc](https://godoc.org/github.com/linkedin/go-zk?status.svg)](https://godoc.org/github.com/linkedin/go-zk)
+[![Build status](https://github.com/linkedin/go-zk/actions/workflows/integration.yaml/badge.svg)](https://github.com/linkedin/go-zk/actions/workflows/integration.yaml)
+[![Coverage Status](https://img.shields.io/codecov/c/github/linkedin/go-zk/master)](https://codecov.io/gh/linkedin/go-zk/branch/master)
 
 License
 -------

server_help_test.go

@@ -296,7 +296,7 @@ func requireNoErrorf(t *testing.T, err error, msgAndArgs ...interface{}) {
 func RequireMinimumZkVersion(t *testing.T, minimum string) {
 	if val, ok := os.LookupEnv("ZK_VERSION"); ok {
 		split := func(v string) (parts []int) {
-			for _, s := range strings.Split(minimum, ".") {
+			for _, s := range strings.Split(v, ".") {
 				i, err := strconv.Atoi(s)
 				if err != nil {
 					t.Fatalf("invalid version segment: %q", s)