From b1294eb74f28dee6c3989151f70073014190f129 Mon Sep 17 00:00:00 2001 From: Tim Middleton Date: Mon, 25 Mar 2024 09:06:32 +0800 Subject: [PATCH] Add CE 24.03 (#168) * Add CE 24.03 * Add JDK21 test * Change next version to 1.6.0 * Update gradle to 8.5 for JDK21 tests --- .../build-test-create-cluster-jdk21.yaml | 83 +++++++++++++++++++ .../workflows/build-test-create-cluster.yaml | 9 +- .github/workflows/build-view-cache.yaml | 1 + .../compatability-tests-released.yaml | 2 +- .github/workflows/compatability-tests.yaml | 2 +- Makefile | 2 +- 6 files changed, 92 insertions(+), 7 deletions(-) create mode 100644 .github/workflows/build-test-create-cluster-jdk21.yaml diff --git a/.github/workflows/build-test-create-cluster-jdk21.yaml b/.github/workflows/build-test-create-cluster-jdk21.yaml new file mode 100644 index 0000000..5d096b4 --- /dev/null +++ b/.github/workflows/build-test-create-cluster-jdk21.yaml @@ -0,0 +1,83 @@ +# Copyright 2021, 2024 Oracle Corporation and/or its affiliates. +# Licensed under the Universal Permissive License v 1.0 as shown at +# https://oss.oracle.com/licenses/upl. + +# --------------------------------------------------------------------------- +# Coherence CLI GitHub Actions CI build - Test Create JDK21 +# --------------------------------------------------------------------------- +name: CI Test Create Cluster JDK21 + +on: + workflow_dispatch: + push: + branches-ignore: + - gh-pages + +jobs: + build: + runs-on: ubuntu-latest + + strategy: + fail-fast: false + matrix: + coherenceVersion: + - 24.03 + javaVersion: + - 21 + +# Checkout the source, we need a depth of zero to fetch all of the history otherwise +# the copyright check cannot work out the date of the files from Git. + steps: + - uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: Set up JDK + uses: actions/setup-java@v4 + with: + java-version: ${{ matrix.javaVersion }} + distribution: 'zulu' + + - name: Cache Go Modules + uses: actions/cache@v4 + with: + path: ~/go/pkg/mod + key: ${{ runner.os }}-go-mods-${{ hashFiles('**/go.sum') }} + restore-keys: | + ${{ runner.os }}-go-mods- + + - name: Cache Maven packages + uses: actions/cache@v4 + with: + path: ~/.m2 + key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} + restore-keys: ${{ runner.os }}-m2 + + - name: Set up Go + uses: actions/setup-go@v5 + with: + go-version: '1.20' + + - name: Build cohctl + shell: bash + run: make cohctl + + - name: Setup Gradle and Run Create Cluster Tests + shell: bash + run: | + DIR=`pwd` + INSTALL=${DIR}/gradle-install + mkdir -p ${DIR}/gradle-home ${INSTALL} + VERSION=8.5 + wget -q -c https://services.gradle.org/distributions/gradle-${VERSION}-bin.zip -P ${INSTALL} + ls -l ${INSTALL} + unzip -d ${DIR}/gradle-home ${INSTALL}/gradle-${VERSION}-bin.zip + export GRADLE_HOME=${DIR}/gradle-home/gradle-${VERSION} + export PATH=$GRADLE_HOME/bin:$PATH + COHERENCE_VERSION=${{ matrix.coherenceVersion }} make test-create-cluster + + - uses: actions/upload-artifact@v3 + if: failure() + with: + name: test-output + path: build/_output/test-logs diff --git a/.github/workflows/build-test-create-cluster.yaml b/.github/workflows/build-test-create-cluster.yaml index 9032cc4..4f48c3c 100644 --- a/.github/workflows/build-test-create-cluster.yaml +++ b/.github/workflows/build-test-create-cluster.yaml @@ -24,8 +24,8 @@ jobs: - 22.06.8-SNAPSHOT - 22.06.6 - 22.06.7 - - 23.09.1 - 23.09.2 + - 24.03 javaVersion: - 17 @@ -72,10 +72,11 @@ jobs: DIR=`pwd` INSTALL=${DIR}/gradle-install mkdir -p ${DIR}/gradle-home ${INSTALL} - wget -q -c https://services.gradle.org/distributions/gradle-7.4.2-bin.zip -P ${INSTALL} + VERSION=7.4.2 + wget -q -c https://services.gradle.org/distributions/gradle-${VERSION}-bin.zip -P ${INSTALL} ls -l ${INSTALL} - unzip -d ${DIR}/gradle-home ${INSTALL}/gradle-7.4.2-bin.zip - export GRADLE_HOME=${DIR}/gradle-home/gradle-7.4.2 + unzip -d ${DIR}/gradle-home ${INSTALL}/gradle-${VERSION}-bin.zip + export GRADLE_HOME=${DIR}/gradle-home/gradle-${VERSION} export PATH=$GRADLE_HOME/bin:$PATH COHERENCE_VERSION=${{ matrix.coherenceVersion }} make test-create-cluster diff --git a/.github/workflows/build-view-cache.yaml b/.github/workflows/build-view-cache.yaml index 2a6c6d0..e5ec25f 100644 --- a/.github/workflows/build-view-cache.yaml +++ b/.github/workflows/build-view-cache.yaml @@ -26,6 +26,7 @@ jobs: - 24.03-SNAPSHOT - 22.06.8-SNAPSHOT - 23.09.2 + - 24.03 # Checkout the source, we need a depth of zero to fetch all of the history otherwise # the copyright check cannot work out the date of the files from Git. diff --git a/.github/workflows/compatability-tests-released.yaml b/.github/workflows/compatability-tests-released.yaml index d7ae167..380e1d0 100644 --- a/.github/workflows/compatability-tests-released.yaml +++ b/.github/workflows/compatability-tests-released.yaml @@ -21,7 +21,7 @@ jobs: fail-fast: false matrix: coherenceVersion: - - 23.09.1 + - 24.03 - 23.09.2 - 22.06.7 - 22.06.8-SNAPSHOT diff --git a/.github/workflows/compatability-tests.yaml b/.github/workflows/compatability-tests.yaml index 292c3a5..8a787f8 100644 --- a/.github/workflows/compatability-tests.yaml +++ b/.github/workflows/compatability-tests.yaml @@ -21,7 +21,7 @@ jobs: fail-fast: false matrix: coherenceVersion: - - 23.09.1 + - 24.03 - 23.09.2 - 22.06.6 - 22.06.7 diff --git a/Makefile b/Makefile index 592fb68..b48c234 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ # ====================================================================================================================== # The version of the CLI being build - this should be a valid SemVer format -VERSION ?= 1.5.4 +VERSION ?= 1.6.0 MILESTONE ?= # Maven version is always 1.0.0 as it is only for testing