Skip to content

build: use latest jdk for jpackage #851

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
abhinayagarwal merged 3 commits into from
Mar 23, 2026
+3 −15
Merged

build: use latest jdk for jpackage #851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f6781a5
build: use latest jdk for jpackage
abhinayagarwal Mar 23, 2026
f298b5c
update to macos-14-large
abhinayagarwal Mar 23, 2026
6d29334
update to macos-15-intel
abhinayagarwal Mar 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions .github/workflows/bundles-mac.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,10 @@ on:
required: true
jobs:
build:
runs-on: macos-13
runs-on: macos-15-intel
steps:
- uses: actions/checkout@v4

- name: Setup JPackage JDK
uses: actions/setup-java@v5
with:
distribution: 'temurin'
java-version: '25.0.1'

- name: Setup Java
uses: oracle-actions/setup-java@v1.4.0
with:
Expand Down Expand Up @@ -109,7 +103,7 @@ jobs:
env:
MAIN_CLASS: com.oracle.javafx.scenebuilder.app.SceneBuilderApp
JAVAFX_HOME: /tmp/javafx-jmods-${{ steps.javafx.outputs.JAVAFX_MAJOR_VERSION }}/
JPACKAGE_HOME: ${{ env.JAVA_HOME_24_X64 }}
JPACKAGE_HOME: ${{ env.JAVA_HOME }}
MACSIGN_PREFIX: ${{ secrets.MACSIGN_PREFIX }}
MACSIGN_USER: ${{ secrets.MACSIGN_USER }}
PROJECT_VERSION: ${{ inputs.project-version }}
Expand Down
8 changes: 1 addition & 7 deletions .github/workflows/bundles-mac_aarch64.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,6 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Setup JPackage JDK
uses: actions/setup-java@v5
with:
distribution: 'temurin'
java-version: '25.0.1'

- name: Setup Java
uses: oracle-actions/setup-java@v1.4.0
with:
Expand Down Expand Up @@ -110,7 +104,7 @@ jobs:
env:
MAIN_CLASS: com.oracle.javafx.scenebuilder.app.SceneBuilderApp
JAVAFX_HOME: /tmp/javafx-jmods-${{ steps.javafx.outputs.JAVAFX_MAJOR_VERSION }}/
JPACKAGE_HOME: ${{ env.JAVA_HOME_24_ARM64 }}
JPACKAGE_HOME: ${{ env.JAVA_HOME }}
MACSIGN_PREFIX: ${{ secrets.MACSIGN_PREFIX }}
MACSIGN_USER: ${{ secrets.MACSIGN_USER }}
PROJECT_VERSION: ${{ inputs.project-version }}
Expand Down
Loading