diff --git a/.github/workflows/test-against-snapshot-1440.yml b/.github/workflows/test-against-snapshot-1440.yml index 071744e..e8951ed 100644 --- a/.github/workflows/test-against-snapshot-1440.yml +++ b/.github/workflows/test-against-snapshot-1440.yml @@ -43,8 +43,8 @@ jobs: strategy: fail-fast: false matrix: - branch: - - v14.1.1.0 + coherenceVersion: + - 14.1.1-0-13-SNAPSHOT steps: - name: Checkout @@ -66,22 +66,6 @@ jobs: - name: Print Versions run: mvn -version && ant -version - - name: Build Coherence Snapshot - shell: bash - env: - COH_BRANCH: ${{ matrix.branch }} - MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false - run: | - # Checkout the git repo for coherence snapshot and build - DIR=`pwd` - CLONE_DIR=coherence-$COH_BRANCH - cd /tmp - git clone https://github.com/oracle/coherence.git $CLONE_DIR - cd $CLONE_DIR - git checkout $COH_BRANCH - mvn --file prj/pom.xml --batch-mode -e -DskipTests clean install - cd $DIR - - name: Set up JDK 11 for Plugin uses: actions/setup-java@v3 with: @@ -95,22 +79,12 @@ jobs: - name: Verify env: - COH_BRANCH: ${{ matrix.branch }} + COH_VERSION: ${{ matrix.coherenceVersion }} shell: bash run: | - CLONE_DIR=coherence-$COH_BRANCH - POM_FILE=/tmp/${CLONE_DIR}/prj/coherence-bom/pom.xml - if [ ! -r $POM_FILE ] ; then - POM_FILE=/tmp/${CLONE_DIR}/prj/pom.xml - fi - COH_VERSION=`cat ${POM_FILE} | grep '' | sed -e 's,^.*,,' -e 's,.*$,,'` - echo "Running verify against $COH_VERSION" mvn --file coherence-visualvm-tests/coherence-visualvm-tests-ce/pom.xml --batch-mode -nsu -e -Dcoherence.version=$COH_VERSION clean install - echo "Removing Coherence cloned directory" - CLONE_DIR=coherence-$COH_BRANCH - rm -rf /tmp/${CLONE_DIR} - name: Build Artifacts test logs uses: actions/upload-artifact@v3 diff --git a/.github/workflows/test-against-snapshot.yml b/.github/workflows/test-against-snapshot.yml index 260a3d6..ae121fe 100644 --- a/.github/workflows/test-against-snapshot.yml +++ b/.github/workflows/test-against-snapshot.yml @@ -43,8 +43,10 @@ jobs: strategy: fail-fast: false matrix: - branch: - - main + coherenceVersion: + - 23.03-SNAPSHOT + - 22.06.5-SNAPSHOT + - 22.06.4-SNAPSHOT steps: - name: Checkout @@ -66,21 +68,6 @@ jobs: - name: Print Versions run: mvn -version && ant -version - - name: Build Coherence Snapshot - shell: bash - env: - COH_BRANCH: ${{ matrix.branch }} - MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false - run: | - # Checkout the git repo for coherence snapshot and build - DIR=`pwd` - CLONE_DIR=coherence-$COH_BRANCH - cd /tmp - git clone https://github.com/oracle/coherence.git $CLONE_DIR - cd $CLONE_DIR/prj - make all - cd $DIR - - name: Build Plugin shell: bash run: | @@ -88,26 +75,15 @@ jobs: - name: Verify env: - COH_BRANCH: ${{ matrix.branch }} + COH_VERSION: ${{ matrix.coherenceVersion }} shell: bash run: | - CLONE_DIR=coherence-$COH_BRANCH - POM_FILE=/tmp/${CLONE_DIR}/prj/coherence-bom/pom.xml - if [ ! -r $POM_FILE ] ; then - POM_FILE=/tmp/${CLONE_DIR}/prj/pom.xml - fi - COH_VERSION=`cat ${POM_FILE} | grep '' | sed -e 's,^.*,,' -e 's,.*$,,'` - echo "Running verify against $COH_VERSION" mvn --file coherence-visualvm-tests/coherence-visualvm-tests-ce/pom.xml --batch-mode -nsu -e -Dcoherence.version=$COH_VERSION clean install echo "Running Topics tests" mvn --file coherence-visualvm-tests/coherence-visualvm-tests-topics/pom.xml -P topics --batch-mode -nsu -e -Dcoherence.version=$COH_VERSION clean install - echo "Removing Coherence cloned directory" - CLONE_DIR=coherence-$COH_BRANCH - rm -rf /tmp/${CLONE_DIR} - - name: Build Artifacts test logs uses: actions/upload-artifact@v3 if: failure() diff --git a/pom.xml b/pom.xml index f75a5f9..cf45ae8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@