This is an automated email from the ASF dual-hosted git repository.

jsinovassinnaik pushed a commit to branch UNOMI-821
in repository https://gitbox.apache.org/repos/asf/unomi.git


The following commit(s) were added to refs/heads/UNOMI-821 by this push:
     new ad4b096d6 update CI to only use JDK11 for master branch
ad4b096d6 is described below

commit ad4b096d6e9d21ece75111de2a093820f587de6f
Author: jsinovassin <jsinovassinn...@jahia.com>
AuthorDate: Fri Apr 19 10:29:53 2024 +0200

    update CI to only use JDK11 for master branch
---
 ...build-tests.yml => unomi-ci-build-tests-1X.yml} |  4 ++--
 .github/workflows/unomi-ci-build-tests.yml         | 24 ++++++++--------------
 ...docs-deploy.yml => unomi-ci-docs-deploy-1X.yml} |  2 +-
 .github/workflows/unomi-ci-docs-deploy.yml         | 10 ++++-----
 4 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/unomi-ci-build-tests.yml 
b/.github/workflows/unomi-ci-build-tests-1X.yml
similarity index 94%
copy from .github/workflows/unomi-ci-build-tests.yml
copy to .github/workflows/unomi-ci-build-tests-1X.yml
index 4ee27ca0e..28921fa26 100644
--- a/.github/workflows/unomi-ci-build-tests.yml
+++ b/.github/workflows/unomi-ci-build-tests-1X.yml
@@ -5,9 +5,9 @@ name: Build and run tests
 
 on:
   push:
-    branches: [ master, unomi-1.x, unomi-1.7.x ]
+    branches: [ unomi-1.x, unomi-1.7.x ]
   pull_request:
-    branches: [ master, unomi-1.x, unomi-1.7.x ]
+    branches: [ unomi-1.x, unomi-1.7.x ]
 
 jobs:
   unit-tests:
diff --git a/.github/workflows/unomi-ci-build-tests.yml 
b/.github/workflows/unomi-ci-build-tests.yml
index 4ee27ca0e..d92ac9264 100644
--- a/.github/workflows/unomi-ci-build-tests.yml
+++ b/.github/workflows/unomi-ci-build-tests.yml
@@ -5,24 +5,20 @@ name: Build and run tests
 
 on:
   push:
-    branches: [ master, unomi-1.x, unomi-1.7.x ]
+    branches: [master]
   pull_request:
-    branches: [ master, unomi-1.x, unomi-1.7.x ]
+    branches: [master]
 
 jobs:
   unit-tests:
     name: Execute unit tests
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        java: [ 1.8, 11]
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK ${{ matrix.java }}
+    - name: Set up JDK 11
       uses: actions/setup-java@v1
       with:
-        java-version: ${{ matrix.java }}
+        java-version: 11
         cache: maven
     - name: Build and Unit tests
       run: mvn -U -ntp -e clean install
@@ -30,16 +26,12 @@ jobs:
   integration-tests:
     name: Execute integration tests
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        java: [ 1.8, 11]
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK ${{ matrix.java }}
+      - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:
-          java-version: ${{ matrix.java }}
+          java-version: 11
           cache: maven
       - name: Integration tests
         run: mvn -ntp clean install -Pintegration-tests
@@ -47,13 +39,13 @@ jobs:
         uses: actions/upload-artifact@v3
         if: false # UNOMI-746 Reactivate if necessary
         with:
-          name: unomi-code-coverage-jdk${{ matrix.java }}-${{ 
github.run_number }}
+          name: unomi-code-coverage-jdk11-${{ github.run_number }}
           path: itests/target/site/jacoco
       - name: Archive unomi logs
         uses: actions/upload-artifact@v3
         if: failure()
         with:
-          name: unomi-log-jdk${{ matrix.java }}-${{ github.run_number }}
+          name: unomi-log-jdk11-${{ github.run_number }}
           path: itests/target/exam/**/data/log
       - name: Publish Test Report
         uses: mikepenz/action-junit-report@v3
diff --git a/.github/workflows/unomi-ci-docs-deploy.yml 
b/.github/workflows/unomi-ci-docs-deploy-1X.yml
similarity index 96%
copy from .github/workflows/unomi-ci-docs-deploy.yml
copy to .github/workflows/unomi-ci-docs-deploy-1X.yml
index b81e7c067..448d61736 100644
--- a/.github/workflows/unomi-ci-docs-deploy.yml
+++ b/.github/workflows/unomi-ci-docs-deploy-1X.yml
@@ -5,7 +5,7 @@ name: Publish Javadoc and snapshots
 
 on:
   push:
-    branches: [ master, unomi-1.x, unomi-1.7.x ]
+    branches: [ unomi-1.x, unomi-1.7.x ]
 
 jobs:
   publish-docs-and-snapshots:
diff --git a/.github/workflows/unomi-ci-docs-deploy.yml 
b/.github/workflows/unomi-ci-docs-deploy.yml
index b81e7c067..081b68006 100644
--- a/.github/workflows/unomi-ci-docs-deploy.yml
+++ b/.github/workflows/unomi-ci-docs-deploy.yml
@@ -5,7 +5,7 @@ name: Publish Javadoc and snapshots
 
 on:
   push:
-    branches: [ master, unomi-1.x, unomi-1.7.x ]
+    branches: [master]
 
 jobs:
   publish-docs-and-snapshots:
@@ -13,10 +13,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
+      - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
           server-id: apache.snapshots.https
           server-username: NEXUS_USER
           server-password: NEXUS_PW
@@ -33,10 +33,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
+      - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
           server-id: apache.snapshots.https
           server-username: NEXUS_USER
           server-password: NEXUS_PW

Reply via email to