HHH-14946 Upgrade Github Actions to use Java 11 exclusively

hibernate · Dec 1, 2021 · 78c3ae1 · 78c3ae1
1 parent 334aeb1
commit 78c3ae1
Showing 1 changed file with 4 additions and 45 deletions.
diff --git a/.github/workflows/contributor-build.yml b/.github/workflows/contributor-build.yml
@@ -17,7 +17,7 @@ on:
       - 'wip/6.0'
 jobs:
   build:
-    name: Java 8
+    name: Java 11
     runs-on: ubuntu-latest
     # We want to know the test results of all matrix entries
     continue-on-error: true
@@ -62,49 +62,6 @@ jobs:
         env:
           RDBMS: ${{ matrix.rdbms }}
         run: ci/database-start.sh
-      - name: Set up Java 8
-        uses: actions/setup-java@v1
-        with:
-          java-version: 1.8
-      - name: Get year/month for cache key
-        id: get-date
-        run: |
-          echo "::set-output name=yearmonth::$(/bin/date -u "+%Y-%m")"
-        shell: bash
-      - name: Cache Maven local repository
-        uses: actions/cache@v2
-        id: cache-maven
-        with:
-          path: |
-            ~/.m2/repository
-            ~/.gradle/caches/
-            ~/.gradle/wrapper/
-          # refresh cache every month to avoid unlimited growth
-          key: maven-localrepo-${{ steps.get-date.outputs.yearmonth }}
-      - name: Run build script
-        env:
-          RDBMS: ${{ matrix.rdbms }}
-        run: ./ci/build-github.sh
-        shell: bash
-      - name: Upload test reports (if Gradle failed)
-        uses: actions/upload-artifact@v2
-        if: failure()
-        with:
-          name: test-reports-java8-${{ matrix.rdbms }}
-          path: |
-            ./**/target/reports/tests/
-            ./**/target/reports/checkstyle/
-      - name: Omit produced artifacts from build cache
-        run: ./ci/before-cache.sh
-  build11:
-    name: Java 11
-    runs-on: ubuntu-latest
-    # We want to know the test results of all matrix entries
-    continue-on-error: true
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          persist-credentials: false
       - name: Set up Java 11
         uses: actions/setup-java@v1
         with:
@@ -125,13 +82,15 @@ jobs:
           # refresh cache every month to avoid unlimited growth
           key: maven-localrepo-${{ steps.get-date.outputs.yearmonth }}
       - name: Run build script
+        env:
+          RDBMS: ${{ matrix.rdbms }}
         run: ./ci/build-github.sh
         shell: bash
       - name: Upload test reports (if Gradle failed)
         uses: actions/upload-artifact@v2
         if: failure()
         with:
-          name: test-reports-java11
+          name: test-reports-java11-${{ matrix.rdbms }}
           path: |
             ./**/target/reports/tests/
             ./**/target/reports/checkstyle/