From 70be2808eac4a3b51f9a3186fe1dc3325a77a717 Mon Sep 17 00:00:00 2001 From: Tim Middleton Date: Wed, 18 Oct 2023 11:12:35 +0800 Subject: [PATCH] Add 22.06.6 to CI/CD (#62) * Add 22.06.6 to CI/CD * Minor doc change --- .github/workflows/build-compatability-2206.yaml | 3 ++- .github/workflows/build.yaml | 10 +++++----- .github/workflows/discovery-compatability-tests.yaml | 3 ++- .github/workflows/discovery-snapshot-tests-22.06.yaml | 2 +- .github/workflows/examples.yaml | 3 ++- coherence/doc.go | 2 +- 6 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-compatability-2206.yaml b/.github/workflows/build-compatability-2206.yaml index b4d40bb..946fa4c 100644 --- a/.github/workflows/build-compatability-2206.yaml +++ b/.github/workflows/build-compatability-2206.yaml @@ -24,7 +24,8 @@ jobs: matrix: coherenceVersion: - 22.06.5 - - 22.06.6-SNAPSHOT + - 22.06.6 + - 22.06.7-SNAPSHOT go-version: - 1.19.x - 1.20.x diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index d5228db..0bb2782 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -76,7 +76,7 @@ jobs: shell: bash run: | go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0 - INCLUDE_LONG_RUNNING=true PROFILES=,-jakarta,javax COHERENCE_VERSION=22.06.4 make clean generate-proto build-test-images test-e2e-standalone + INCLUDE_LONG_RUNNING=true PROFILES=,-jakarta,javax COHERENCE_VERSION=22.06.6 make clean generate-proto build-test-images test-e2e-standalone - uses: actions/upload-artifact@v3 if: failure() @@ -88,7 +88,7 @@ jobs: shell: bash run: | go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0 - COHERENCE_VERSION=22.06.5 PROFILES=,-jakarta,javax,scope make clean generate-proto build-test-images test-e2e-standalone-scope + COHERENCE_VERSION=22.06.6 PROFILES=,-jakarta,javax,scope make clean generate-proto build-test-images test-e2e-standalone-scope - uses: actions/upload-artifact@v3 if: failure() @@ -103,7 +103,7 @@ jobs: COHERENCE_TLS_CERTS_PATH=`pwd`/test/utils/certs/guardians-ca.crt \ COHERENCE_TLS_CLIENT_CERT=`pwd`/test/utils/certs/star-lord.crt \ COHERENCE_TLS_CLIENT_KEY=`pwd`/test/utils/certs/star-lord.key \ - COHERENCE_VERSION=22.06.5 PROFILES=,secure,-jakarta,javax make clean certs generate-proto build-test-images test-e2e-standalone + COHERENCE_VERSION=22.06.6 PROFILES=,secure,-jakarta,javax make clean certs generate-proto build-test-images test-e2e-standalone - name: E2E Local Tests SSL (options) shell: bash @@ -112,7 +112,7 @@ jobs: COHERENCE_TLS_CERTS_PATH_OPTION=`pwd`/test/utils/certs/guardians-ca.crt \ COHERENCE_TLS_CLIENT_CERT_OPTION=`pwd`/test/utils/certs/star-lord.crt \ COHERENCE_TLS_CLIENT_KEY_OPTION=`pwd`/test/utils/certs/star-lord.key \ - COHERENCE_VERSION=22.06.5 PROFILES=,secure,-jakarta,javax,scope make clean certs generate-proto build-test-images test-e2e-standalone-scope + COHERENCE_VERSION=22.06.6 PROFILES=,secure,-jakarta,javax,scope make clean certs generate-proto build-test-images test-e2e-standalone-scope - name: E2E Local Tests SSL (tlsConfig) shell: bash @@ -121,7 +121,7 @@ jobs: COHERENCE_TLS_CERTS_PATH_OPTION=`pwd`/test/utils/certs/guardians-ca.crt \ COHERENCE_TLS_CLIENT_CERT_OPTION=`pwd`/test/utils/certs/star-lord.crt \ COHERENCE_TLS_CLIENT_KEY_OPTION=`pwd`/test/utils/certs/star-lord.key \ - COHERENCE_VERSION=22.06.5 PROFILES=,secure,-jakarta,javax,scope make clean certs generate-proto build-test-images test-e2e-standalone-scope + COHERENCE_VERSION=22.06.6 PROFILES=,secure,-jakarta,javax,scope make clean certs generate-proto build-test-images test-e2e-standalone-scope - uses: actions/upload-artifact@v3 if: failure() diff --git a/.github/workflows/discovery-compatability-tests.yaml b/.github/workflows/discovery-compatability-tests.yaml index d5bfa94..b998087 100644 --- a/.github/workflows/discovery-compatability-tests.yaml +++ b/.github/workflows/discovery-compatability-tests.yaml @@ -21,7 +21,8 @@ jobs: matrix: coherenceVersion: - 22.06.5 - - 22.06.6-SNAPSHOT + - 22.06.6 + - 22.06.7-SNAPSHOT - 23.03.1 - 23.09 - 23.09.1-SNAPSHOT diff --git a/.github/workflows/discovery-snapshot-tests-22.06.yaml b/.github/workflows/discovery-snapshot-tests-22.06.yaml index fce09ab..c641337 100644 --- a/.github/workflows/discovery-snapshot-tests-22.06.yaml +++ b/.github/workflows/discovery-snapshot-tests-22.06.yaml @@ -23,7 +23,7 @@ jobs: fail-fast: false matrix: coherenceVersion: - - 22.06.6-SNAPSHOT + - 22.06.7-SNAPSHOT go-version: - 1.19.x - 1.20.x diff --git a/.github/workflows/examples.yaml b/.github/workflows/examples.yaml index 5abbdee..bffd3fe 100644 --- a/.github/workflows/examples.yaml +++ b/.github/workflows/examples.yaml @@ -20,8 +20,9 @@ jobs: fail-fast: false matrix: coherenceVersion: - - 22.06.6-SNAPSHOT + - 22.06.7-SNAPSHOT - 22.06.5 + - 22.06.6 go-version: - 1.19.x - 1.20.x diff --git a/coherence/doc.go b/coherence/doc.go index c168773..122d8dd 100644 --- a/coherence/doc.go +++ b/coherence/doc.go @@ -231,7 +231,7 @@ EntrySet, KeySet, Values, InvokeAll and InvokeAllFilter. ch := namedMap.EntrySetFilter(ctx, filters.Greater(age, 20)) for result := range ch { if result.Err != nil { - log.Fatal(err) + log.Fatal(result.Err) } fmt.Println("Key:", result.Key, "Value:", result.Value) }