Skip to content

Commit f6781a5

Browse files
build: use latest jdk for jpackage
1 parent 91e1869 commit f6781a5

2 files changed

Lines changed: 2 additions & 14 deletions

File tree

.github/workflows/bundles-mac.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,6 @@ jobs:
4343
steps:
4444
- uses: actions/checkout@v4
4545

46-
- name: Setup JPackage JDK
47-
uses: actions/setup-java@v5
48-
with:
49-
distribution: 'temurin'
50-
java-version: '25.0.1'
51-
5246
- name: Setup Java
5347
uses: oracle-actions/setup-java@v1.4.0
5448
with:
@@ -109,7 +103,7 @@ jobs:
109103
env:
110104
MAIN_CLASS: com.oracle.javafx.scenebuilder.app.SceneBuilderApp
111105
JAVAFX_HOME: /tmp/javafx-jmods-${{ steps.javafx.outputs.JAVAFX_MAJOR_VERSION }}/
112-
JPACKAGE_HOME: ${{ env.JAVA_HOME_24_X64 }}
106+
JPACKAGE_HOME: ${{ env.JAVA_HOME }}
113107
MACSIGN_PREFIX: ${{ secrets.MACSIGN_PREFIX }}
114108
MACSIGN_USER: ${{ secrets.MACSIGN_USER }}
115109
PROJECT_VERSION: ${{ inputs.project-version }}

.github/workflows/bundles-mac_aarch64.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,6 @@ jobs:
4444
steps:
4545
- uses: actions/checkout@v4
4646

47-
- name: Setup JPackage JDK
48-
uses: actions/setup-java@v5
49-
with:
50-
distribution: 'temurin'
51-
java-version: '25.0.1'
52-
5347
- name: Setup Java
5448
uses: oracle-actions/setup-java@v1.4.0
5549
with:
@@ -110,7 +104,7 @@ jobs:
110104
env:
111105
MAIN_CLASS: com.oracle.javafx.scenebuilder.app.SceneBuilderApp
112106
JAVAFX_HOME: /tmp/javafx-jmods-${{ steps.javafx.outputs.JAVAFX_MAJOR_VERSION }}/
113-
JPACKAGE_HOME: ${{ env.JAVA_HOME_24_ARM64 }}
107+
JPACKAGE_HOME: ${{ env.JAVA_HOME }}
114108
MACSIGN_PREFIX: ${{ secrets.MACSIGN_PREFIX }}
115109
MACSIGN_USER: ${{ secrets.MACSIGN_USER }}
116110
PROJECT_VERSION: ${{ inputs.project-version }}

0 commit comments

Comments
 (0)