Prepare for release 23.0.1 (#755)

* build: Update bundles-mac.yml (#735, #736) Run workflow on macOS-13 for Intel build * bump JDK and JavaFX versions (#752) * update early access job
gluonhq · Oct 16, 2024 · 66546ee · 66546ee
1 parent e10bbdd
commit 66546ee
Show file tree

Hide file tree

Showing 9 changed files with 64 additions and 28 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -3,7 +3,8 @@ on:
   pull_request:
 
 env:
-  JAVA_VERSION: '23'
+  JAVA_RELEASE: '23'
+  JAVA_VERSION: '23.0.1'
 
 jobs:
   verify:
@@ -20,7 +21,8 @@ jobs:
         uses: oracle-actions/[email protected]
         with:
           website: jdk.java.net
-          release: ${{ env.JAVA_VERSION }}
+          release: ${{ env.JAVA_RELEASE }}
+          version: ${{ env.JAVA_VERSION }}
 
       - name: Run Tests (Linux)
         if: runner.os == 'Linux'

diff --git a/.github/workflows/bundles-kit.yml b/.github/workflows/bundles-kit.yml
@@ -6,10 +6,14 @@ on:
       project-version:
         required: true
         type: string
-      java-version:
+      java-release:
         default: '23'
         required: false
         type: string
+      java-version:
+        default: '23.0.1'
+        required: false
+        type: string
 
 jobs:
   build:
@@ -21,7 +25,8 @@ jobs:
         uses: oracle-actions/[email protected]
         with:
           website: jdk.java.net
-          release: ${{ inputs.java-version }}
+          release: ${{ inputs.java-release }}
+          version: ${{ inputs.java-version }}
 
       - name: Cache Maven packages
         uses: actions/cache@v4

diff --git a/.github/workflows/bundles-linux.yml b/.github/workflows/bundles-linux.yml
@@ -9,12 +9,16 @@ on:
       project-version:
         required: true
         type: string
-      java-version:
+      java-release:
         default: '23'
         required: false
         type: string
+      java-version:
+        default: '23.0.1'
+        required: false
+        type: string
       javafx-version:
-        default: '23'
+        default: '23.0.1'
         required: false
         type: string
       test:
@@ -35,7 +39,8 @@ jobs:
         uses: oracle-actions/[email protected]
         with:
           website: jdk.java.net
-          release: ${{ inputs.java-version }}
+          release: ${{ inputs.java-release }}
+          version: ${{ inputs.java-version }}
 
       - name: Setup JavaFX
         id: javafx

diff --git a/.github/workflows/bundles-mac.yml b/.github/workflows/bundles-mac.yml
@@ -9,12 +9,16 @@ on:
       project-version:
         required: true
         type: string
-      java-version:
+      java-release:
         default: '23'
         required: false
         type: string
+      java-version:
+        default: '23.0.1'
+        required: false
+        type: string
       javafx-version:
-        default: '23'
+        default: '23.0.1'
         required: false
         type: string
       test:
@@ -36,15 +40,16 @@ on:
         required: true
 jobs:
   build:
-    runs-on: macos-latest
+    runs-on: macos-13
     steps:
       - uses: actions/checkout@v4
 
       - name: Setup Java
         uses: oracle-actions/[email protected]
         with:
           website: jdk.java.net
-          release: ${{ inputs.java-version }}
+          release: ${{ inputs.java-release }}
+          version: ${{ inputs.java-version }}
 
       - uses: Apple-Actions/import-codesign-certs@v1
         with:

diff --git a/.github/workflows/bundles-mac_aarch64.yml b/.github/workflows/bundles-mac_aarch64.yml
@@ -9,12 +9,16 @@ on:
       project-version:
         required: true
         type: string
-      java-version:
+      java-release:
         default: '23'
         required: false
         type: string
+      java-version:
+        default: '23.0.1'
+        required: false
+        type: string
       javafx-version:
-        default: '23'
+        default: '23.0.1'
         required: false
         type: string
       test:
@@ -45,7 +49,8 @@ jobs:
         uses: oracle-actions/[email protected]
         with:
           website: jdk.java.net
-          release: ${{ inputs.java-version }}
+          release: ${{ inputs.java-release }}
+          version: ${{ inputs.java-version }}
 
       - uses: Apple-Actions/import-codesign-certs@v1
         with:

diff --git a/.github/workflows/bundles-windows.yml b/.github/workflows/bundles-windows.yml
@@ -9,12 +9,16 @@ on:
       project-version:
         required: true
         type: string
-      java-version:
+      java-release:
         default: '23'
         required: false
         type: string
+      java-version:
+        default: '23.0.1'
+        required: false
+        type: string
       javafx-version:
-        default: '23'
+        default: '23.0.1'
         required: false
         type: string
       test:
@@ -39,7 +43,8 @@ jobs:
         uses: oracle-actions/[email protected]
         with:
           website: jdk.java.net
-          release: ${{ inputs.java-version }}
+          release: ${{ inputs.java-release }}
+          version: ${{ inputs.java-version }}
 
       - name: Setup JavaFX
         id: javafx

diff --git a/.github/workflows/early-access.yml b/.github/workflows/early-access.yml
@@ -3,18 +3,21 @@ name: Early Access
 on:
   push:
     branches: [ master ]
+  workflow_dispatch:
 
 env:
-  JAVAFX_VERSION: '23'
-  JAVA_VERSION: '23'
+  JAVA_RELEASE: '23'
+  JAVA_VERSION: '23.0.1'
+  JAVAFX_VERSION: '23.0.1'
 
 jobs:
   precheck:
     runs-on: ubuntu-20.04
     if: startsWith(github.event.head_commit.message, 'Releasing version') != true
     outputs:
-      JAVAFX_VERSION: ${{ env.JAVAFX_VERSION }}
+      JAVA_RELEASE: ${{ env.JAVA_RELEASE }}
       JAVA_VERSION: ${{ env.JAVA_VERSION }}
+      JAVAFX_VERSION: ${{ env.JAVAFX_VERSION }}
       APP_VERSION: ${{ steps.vars.outputs.APP_VERSION }}
       PROJECT_VERSION: ${{ steps.vars.outputs.PROJECT_VERSION }}
     steps:
@@ -25,7 +28,8 @@ jobs:
         uses: oracle-actions/[email protected]
         with:
           website: jdk.java.net
-          release: ${{ env.JAVA_VERSION }}
+          release: ${{ env.JAVA_RELEASE }}
+          version: ${{ env.JAVA_VERSION }}
 
       - name: Cache Maven packages
         uses: actions/cache@v4
@@ -129,7 +133,8 @@ jobs:
         uses: oracle-actions/[email protected]
         with:
           website: jdk.java.net
-          release: ${{ needs.precheck.outputs.JAVA_VERSION }}
+          release: ${{ needs.precheck.outputs.JAVA_RELEASE }}
+          version: ${{ needs.precheck.outputs.JAVA_VERSION }}
 
       - name: Cache Maven packages
         uses: actions/cache@v4

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -11,15 +11,17 @@ on:
           - GA
 
 env:
-  JAVAFX_VERSION: '23'
-  JAVA_VERSION: '23'
+  JAVA_RELEASE: '23'
+  JAVA_VERSION: '23.0.1'
+  JAVAFX_VERSION: '23.0.1'
 
 jobs:
   precheck:
     runs-on: ubuntu-20.04
     outputs:
-      JAVAFX_VERSION: ${{ env.JAVAFX_VERSION }}
+      JAVA_RELEASE: ${{ env.JAVA_RELEASE }}
       JAVA_VERSION: ${{ env.JAVA_VERSION }}
+      JAVAFX_VERSION: ${{ env.JAVAFX_VERSION }}
       APP_VERSION: ${{ steps.vars.outputs.APP_VERSION }}
       PROJECT_VERSION: ${{ steps.vars.outputs.PROJECT_VERSION }}
       S3_PATH: ${{ steps.vars.outputs.S3_PATH }}
@@ -31,7 +33,8 @@ jobs:
         uses: oracle-actions/[email protected]
         with:
           website: jdk.java.net
-          release: ${{ env.JAVA_VERSION }}
+          release: ${{ env.JAVA_RELEASE }}
+          version: ${{ env.JAVA_VERSION }}
 
       - name: Cache Maven packages
         uses: actions/cache@v4
@@ -136,7 +139,8 @@ jobs:
         uses: oracle-actions/[email protected]
         with:
           website: jdk.java.net
-          release: ${{ needs.precheck.outputs.JAVA_VERSION }}
+          release: ${{ needs.precheck.outputs.JAVA_RELEASE }}
+          version: ${{ needs.precheck.outputs.JAVA_VERSION }}
 
       - name: Cache Maven packages
         uses: actions/cache@v4

diff --git a/pom.xml b/pom.xml
@@ -20,7 +20,7 @@
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <maven.compiler.release>${java.version}</maven.compiler.release>
-        <javafx.version>23</javafx.version>
+        <javafx.version>23.0.1</javafx.version>
         <aether.version>1.1.0</aether.version>
         <charm.glisten.version>6.2.2</charm.glisten.version>
         <gluon.attach.version>4.0.19</gluon.attach.version>