From aa2fd11198964f85c46261aa8c7e5477f7fb91a9 Mon Sep 17 00:00:00 2001 From: Ryan Lubke Date: Tue, 21 Jan 2025 13:03:52 -0800 Subject: [PATCH 1/2] Version updates. --- .github/workflows/node.js.yml | 4 ++-- .github/workflows/release.yml | 6 +++--- DEVELOPING.md | 2 +- README.md | 6 +++--- bin/docker-utils.sh | 2 +- bin/test-cycle.sh | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 6b54ff6..c79ad3e 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -27,8 +27,8 @@ jobs: strategy: fail-fast: false matrix: - node-version: [18.15.x, 19.x] - coherence-version: [22.06.10, 24.09] + node-version: [18.x, 19.x, 20.x, 21.x, 22.x, 23.x] + coherence-version: [22.06.11, 24.09.1] steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0a05d93..b13fba2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,7 +25,7 @@ jobs: with: ref: ${{ github.event.release.target_commitish }} # install Node.js - - name: Use Node.js 18.15.x + - name: Use Node.js 18.x uses: actions/setup-node@v3 with: node-version: 18.15.x @@ -37,8 +37,8 @@ jobs: - run: echo "/tmp/grpc/bin" >> $GITHUB_PATH - run: npm install # run unit tests - - run: COHERENCE_VERSION=22.06.10 npm run test-cycle - - run: COHERENCE_VERSION=24.09 npm run test-cycle + - run: COHERENCE_VERSION=22.06.11 npm run test-cycle + - run: COHERENCE_VERSION=24.09.1 npm run test-cycle - run: npm install --no-save typedoc # generate dist which runs other tasks - run: npm run dist diff --git a/DEVELOPING.md b/DEVELOPING.md index 108bb55..dfe27cf 100644 --- a/DEVELOPING.md +++ b/DEVELOPING.md @@ -44,7 +44,7 @@ The above can also be shortened to: However, if developing new functionality or tests, the manual start of the cluster using `coh-up` may be preferred as it avoids restarting the cluster allowing for quicker development times. -**Important!** When calling `coh-up`, `test`, `coh-down`, or `test-cycle` the LTS version of Coherence will be used (`22.06.10`). +**Important!** When calling `coh-up`, `test`, `coh-down`, or `test-cycle` the LTS version of Coherence will be used (`22.06.11`). To use a later Coherence version, such as `22.03`, prefix the calls with, or export `COHERENCE_VERSION=`. For example: ```bash diff --git a/README.md b/README.md index 3f632f8..6fba618 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ the network transport. Before testing the library, you must ensure a Coherence cluster is available. For local development, we recommend using the Coherence CE Docker image; it contains everything necessary for the client to operate correctly. ```bash -docker run -d -p 1408:1408 ghcr.io/oracle/coherence-ce:24.03 +docker run -d -p 1408:1408 ghcr.io/oracle/coherence-ce:24.09.1 ``` or to save some keystrokes/time, use the included npm script, `coh-up` to start a two-member Cluster with the gRPC port at 1408" @@ -29,8 +29,8 @@ or to save some keystrokes/time, use the included npm script, `coh-up` to start npm run coh-up ``` -**Important!** When calling `coh-up` or `coh-down`, the LTS version of Coherence will be used (`22.06.10`). -To use a later Coherence version, such as `24.03`, prefix the calls with, or export `COHERENCE_VERSION=`. +**Important!** When calling `coh-up` or `coh-down`, the LTS version of Coherence will be used (`22.06.11`). +To use a later Coherence version, such as `24.09.1`, prefix the calls with, or export `COHERENCE_VERSION=`. For example: ```bash COHERENCE_VERSION=24.03 npm run coh-up diff --git a/bin/docker-utils.sh b/bin/docker-utils.sh index 1ce73f1..fb95530 100755 --- a/bin/docker-utils.sh +++ b/bin/docker-utils.sh @@ -7,7 +7,7 @@ set -e -declare VERSION=${COHERENCE_VERSION:=22.06.10} +declare VERSION=${COHERENCE_VERSION:=22.06.11} declare TYPE=${COHERENCE_TYPE:=coherence-ce} declare REGISTRY=${DOCKER_REGISTRY:=ghcr.io/oracle} diff --git a/bin/test-cycle.sh b/bin/test-cycle.sh index 0336ee6..e6089d1 100755 --- a/bin/test-cycle.sh +++ b/bin/test-cycle.sh @@ -10,7 +10,7 @@ set -e mkdir -p "${PWD}"/etc/cert chmod 777 "${PWD}"/etc/cert -declare VERSION=${COHERENCE_VERSION:=22.06.10} +declare VERSION=${COHERENCE_VERSION:=22.06.11} declare TYPE=${COHERENCE_TYPE:=coherence-ce} declare REGISTRY=${DOCKER_REGISTRY:=ghcr.io/oracle} declare LABEL=clear From de63767dd5074d58e9e2a75f9b018ac460155865 Mon Sep 17 00:00:00 2001 From: Ryan Lubke Date: Tue, 21 Jan 2025 13:07:27 -0800 Subject: [PATCH 2/2] Version updates. --- .github/workflows/node.js.yml | 2 +- .github/workflows/release.yml | 2 +- README.md | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index c79ad3e..3a00e9b 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -28,7 +28,7 @@ jobs: fail-fast: false matrix: node-version: [18.x, 19.x, 20.x, 21.x, 22.x, 23.x] - coherence-version: [22.06.11, 24.09.1] + coherence-version: [22.06.11, 24.09] steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b13fba2..e5cccfe 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,7 +38,7 @@ jobs: - run: npm install # run unit tests - run: COHERENCE_VERSION=22.06.11 npm run test-cycle - - run: COHERENCE_VERSION=24.09.1 npm run test-cycle + - run: COHERENCE_VERSION=24.09 npm run test-cycle - run: npm install --no-save typedoc # generate dist which runs other tasks - run: npm run dist diff --git a/README.md b/README.md index 6fba618..ad4c533 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ the network transport. Before testing the library, you must ensure a Coherence cluster is available. For local development, we recommend using the Coherence CE Docker image; it contains everything necessary for the client to operate correctly. ```bash -docker run -d -p 1408:1408 ghcr.io/oracle/coherence-ce:24.09.1 +docker run -d -p 1408:1408 ghcr.io/oracle/coherence-ce:24.09 ``` or to save some keystrokes/time, use the included npm script, `coh-up` to start a two-member Cluster with the gRPC port at 1408" @@ -30,7 +30,7 @@ npm run coh-up ``` **Important!** When calling `coh-up` or `coh-down`, the LTS version of Coherence will be used (`22.06.11`). -To use a later Coherence version, such as `24.09.1`, prefix the calls with, or export `COHERENCE_VERSION=`. +To use a later Coherence version, such as `24.09`, prefix the calls with, or export `COHERENCE_VERSION=`. For example: ```bash COHERENCE_VERSION=24.03 npm run coh-up