Switch back to using github setup-java. Enable release workflow

barchetta · Sep 28, 2023 · 15a665e · 15a665e
1 parent 5805cfe
commit 15a665e
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 37 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -6,10 +6,10 @@ name: "Release"
 on:
   push:
     branches:
-      - 'test-release-*'
+      - 'release-*'
 env:
   JAVA_VERSION: '21'
-  JAVA_DISTRO: 'oracle.com'
+  JAVA_DISTRO: 'oracle'
   MAVEN_HTTP_ARGS: '-Dmaven.wagon.httpconnectionManager.ttlSeconds=60 -Dmaven.wagon.http.retryHandler.count=3'
 
 concurrency:
@@ -25,10 +25,10 @@ jobs:
         with:
           fetch-depth: 0
       - name: Set up JDK ${{ env.JAVA_VERSION }}
-        uses: oracle-actions/setup-java@v1.3.2
+        uses: actions/setup-java@v3.13.0
         with:
-          website: ${{ env.JAVA_DISTRO }}
-          release: ${{ env.JAVA_RELEASE }}
+          distribution: ${{ env.JAVA_DISTRO }}
+          java-version: ${{ env.JAVA_VERSION }}
           cache: maven
       - name: Copyright
         run: etc/scripts/copyright.sh
@@ -42,10 +42,10 @@ jobs:
           token: ${{ secrets.SERVICE_ACCOUNT_TOKEN }}
           fetch-depth: '0'
       - name: Set up JDK ${{ env.JAVA_VERSION }}
-        uses: oracle-actions/setup-java@v1.3.2
+        uses: actions/setup-java@v3.13.0
         with:
-          website: ${{ env.JAVA_DISTRO }}
-          release: ${{ env.JAVA_RELEASE }}
+          distribution: ${{ env.JAVA_DISTRO }}
+          java-version: ${{ env.JAVA_VERSION }}
           cache: maven
       - name: Release
         env:

diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
@@ -7,8 +7,8 @@ name: "Validate"
 on: [pull_request, push]
 
 env:
-  JAVA_RELEASE: '21'
-  JAVA_DISTRO: 'oracle.com'
+  JAVA_VERSION: '21'
+  JAVA_DISTRO: 'oracle'
   HELIDON_PIPELINES: 'true'
   MAVEN_HTTP_ARGS: '-Dmaven.wagon.httpconnectionManager.ttlSeconds=60 -Dmaven.wagon.http.retryHandler.count=3'
 
@@ -25,10 +25,10 @@ jobs:
        with:
          fetch-depth: 0
      - name: Set up JDK ${{ env.JAVA_VERSION }}
-       uses: oracle-actions/setup-java@v1.3.2
+       uses: actions/setup-java@v3.13.0
        with:
-         website: ${{ env.JAVA_DISTRO }}
-         release: ${{ env.JAVA_RELEASE }}
+         distribution: ${{ env.JAVA_DISTRO }}
+         java-version: ${{ env.JAVA_VERSION }}
          cache: maven
      - name: Copyright
        run: etc/scripts/copyright.sh
@@ -38,10 +38,10 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Set up JDK ${{ env.JAVA_VERSION }}
-        uses: oracle-actions/setup-java@v1.3.2
+        uses: actions/setup-java@v3.13.0
         with:
-          website: ${{ env.JAVA_DISTRO }}
-          release: ${{ env.JAVA_RELEASE }}
+          distribution: ${{ env.JAVA_DISTRO }}
+          java-version: ${{ env.JAVA_VERSION }}
           cache: maven
       - name: Checkstyle
         run: etc/scripts/checkstyle.sh
@@ -51,10 +51,10 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Set up JDK ${{ env.JAVA_VERSION }}
-        uses: oracle-actions/setup-java@v1.3.2
+        uses: actions/setup-java@v3.13.0
         with:
-          website: ${{ env.JAVA_DISTRO }}
-          release: ${{ env.JAVA_RELEASE }}
+          distribution: ${{ env.JAVA_DISTRO }}
+          java-version: ${{ env.JAVA_VERSION }}
           cache: maven
       - name: Spotbugs
         run: etc/scripts/spotbugs.sh
@@ -64,10 +64,10 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Set up JDK ${{ env.JAVA_VERSION }}
-        uses: oracle-actions/setup-java@v1.3.2
+        uses: actions/setup-java@v3.13.0
         with:
-          website: ${{ env.JAVA_DISTRO }}
-          release: ${{ env.JAVA_RELEASE }}
+          distribution: ${{ env.JAVA_DISTRO }}
+          java-version: ${{ env.JAVA_VERSION }}
           cache: maven
       - name: Docs
         run: etc/scripts/site.sh
@@ -80,10 +80,10 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Set up JDK ${{ env.JAVA_VERSION }}
-        uses: oracle-actions/setup-java@v1.3.2
+        uses: actions/setup-java@v3.13.0
         with:
-          website: ${{ env.JAVA_DISTRO }}
-          release: ${{ env.JAVA_RELEASE }}
+          distribution: ${{ env.JAVA_DISTRO }}
+          java-version: ${{ env.JAVA_VERSION }}
           cache: maven
       - name: Maven build
         run: etc/scripts/github-build.sh
@@ -96,10 +96,10 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Set up JDK ${{ env.JAVA_VERSION }}
-        uses: oracle-actions/setup-java@v1.3.2
+        uses: actions/setup-java@v3.13.0
         with:
-          website: ${{ env.JAVA_DISTRO }}
-          release: ${{ env.JAVA_RELEASE }}
+          distribution: ${{ env.JAVA_DISTRO }}
+          java-version: ${{ env.JAVA_VERSION }}
           cache: maven
       - name: Maven build
         run: |
@@ -116,10 +116,10 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Set up JDK ${{ env.JAVA_VERSION }}
-        uses: oracle-actions/setup-java@v1.3.2
+        uses: actions/setup-java@v3.13.0
         with:
-          website: ${{ env.JAVA_DISTRO }}
-          release: ${{ env.JAVA_RELEASE }}
+          distribution: ${{ env.JAVA_DISTRO }}
+          java-version: ${{ env.JAVA_VERSION }}
           cache: maven
       - name: Maven build
         run: etc/scripts/mp-tck.sh
@@ -132,10 +132,10 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Set up JDK ${{ env.JAVA_VERSION }}
-        uses: oracle-actions/setup-java@v1.3.2
+        uses: actions/setup-java@v3.13.0
         with:
-          website: ${{ env.JAVA_DISTRO }}
-          release: ${{ env.JAVA_RELEASE }}
+          distribution: ${{ env.JAVA_DISTRO }}
+          java-version: ${{ env.JAVA_VERSION }}
           cache: maven
       - name: Test archetypes
         run: etc/scripts/test-archetypes.sh
@@ -148,10 +148,10 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Set up JDK ${{ env.JAVA_VERSION }}
-        uses: oracle-actions/setup-java@v1.3.2
+        uses: actions/setup-java@v3.13.0
         with:
-          website: ${{ env.JAVA_DISTRO }}
-          release: ${{ env.JAVA_RELEASE }}
+          distribution: ${{ env.JAVA_DISTRO }}
+          java-version: ${{ env.JAVA_VERSION }}
           cache: maven
       - name: Build Helidon
         run: etc/scripts/github-compile.sh