Skip to content
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

Jump to bottom

build: Use Java and JavaFX 23-ea #707

Merged
merged 14 commits into from
Aug 26, 2024
Merged

build: Use Java and JavaFX 23-ea #707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
fa59828
build: Use Java and JavaFX 23
abhinayagarwal Aug 22, 2024
13e334d
Merge branch 'master' of https://github.com/gluonhq/scenebuilder into…
abhinayagarwal Aug 23, 2024
71f72fc
test build version
abhinayagarwal Aug 23, 2024
8e69b6b
fix build
abhinayagarwal Aug 23, 2024
da05941
fix assignment
abhinayagarwal Aug 23, 2024
928347d
fix name
abhinayagarwal Aug 23, 2024
6b6ad75
use ea in pom.xml
abhinayagarwal Aug 23, 2024
edd8a48
update build
abhinayagarwal Aug 23, 2024
6f5a064
fix build
abhinayagarwal Aug 23, 2024
d23aeb9
fix windows build
abhinayagarwal Aug 23, 2024
2003f34
add javafx major version to jpackage
abhinayagarwal Aug 23, 2024
8e88c4b
fix github output for windows
abhinayagarwal Aug 23, 2024
f8de0b6
remove usage of ::set-output
abhinayagarwal Aug 23, 2024
318b72e
remove branch for test
abhinayagarwal Aug 23, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on:
pull_request:

env:
JAVA_VERSION: '22'
JAVA_VERSION: '23'

jobs:
verify:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/bundles-kit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
required: true
type: string
java-version:
default: '22'
default: '23'
required: false
type: string

Expand Down
11 changes: 7 additions & 4 deletions .github/workflows/bundles-linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ on:
required: true
type: string
java-version:
default: '22'
default: '23'
required: false
type: string
javafx-version:
default: '22'
default: '23'
required: false
type: string
test:
Expand All @@ -38,8 +38,11 @@ jobs:
release: ${{ inputs.java-version }}

- name: Setup JavaFX
id: javafx
run: |
wget -P /tmp https://download2.gluonhq.com/openjfx/${{ inputs.javafx-version }}/openjfx-${{ inputs.javafx-version }}_linux-x64_bin-jmods.zip
JAVAFX_MAJOR_VERSION=$(echo ${{ inputs.javafx-version }} | cut -d- -f1)
echo JAVAFX_MAJOR_VERSION=$JAVAFX_MAJOR_VERSION >> $GITHUB_OUTPUT
wget -P /tmp https://download2.gluonhq.com/openjfx/$JAVAFX_MAJOR_VERSION/openjfx-${{ inputs.javafx-version }}_linux-x64_bin-jmods.zip
unzip /tmp/openjfx-${{ inputs.javafx-version }}_linux-x64_bin-jmods.zip -d /tmp

- name: Cache Maven packages
Expand Down Expand Up @@ -89,7 +92,7 @@ jobs:
ls ${{ env.INSTALL_DIR }}
env:
MAIN_CLASS: com.oracle.javafx.scenebuilder.app.SceneBuilderApp
JAVAFX_HOME: /tmp/javafx-jmods-${{ inputs.javafx-version }}/
JAVAFX_HOME: /tmp/javafx-jmods-${{ steps.javafx.outputs.JAVAFX_MAJOR_VERSION }}/
JPACKAGE_HOME: ${{ env.JAVA_HOME }}
PROJECT_VERSION: ${{ inputs.project-version }}
APP_VERSION: ${{ inputs.app-version }}
Expand Down
13 changes: 8 additions & 5 deletions .github/workflows/bundles-mac.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ on:
required: true
type: string
java-version:
default: '22'
default: '23'
required: false
type: string
javafx-version:
default: '22'
default: '23'
required: false
type: string
test:
Expand Down Expand Up @@ -52,8 +52,11 @@ jobs:
p12-password: ${{ secrets.CERTIFICATES_PASSWORD }}

- name: Setup JavaFX
id: javafx
run: |
wget -P /tmp https://download2.gluonhq.com/openjfx/${{ inputs.javafx-version }}/openjfx-${{ inputs.javafx-version }}_osx-x64_bin-jmods.zip
JAVAFX_MAJOR_VERSION=$(echo ${{ inputs.javafx-version }} | cut -d- -f1)
echo JAVAFX_MAJOR_VERSION=$JAVAFX_MAJOR_VERSION >> $GITHUB_OUTPUT
wget -P /tmp https://download2.gluonhq.com/openjfx/$JAVAFX_MAJOR_VERSION/openjfx-${{ inputs.javafx-version }}_osx-x64_bin-jmods.zip
unzip /tmp/openjfx-${{ inputs.javafx-version }}_osx-x64_bin-jmods.zip -d /tmp

- name: Cache Maven packages
Expand Down Expand Up @@ -89,10 +92,10 @@ jobs:
--mac-sign
mv ${{ env.INSTALL_DIR }}/SceneBuilder-${{ env.APP_VERSION }}.dmg ${{ env.INSTALL_DIR }}/SceneBuilder-${{ env.PROJECT_VERSION }}-amd64.dmg
ls ${{ env.INSTALL_DIR }}
echo ::set-output name=path::${{ env.INSTALL_DIR }}/SceneBuilder-${{ env.PROJECT_VERSION }}-amd64.dmg
echo path=${{ env.INSTALL_DIR }}/SceneBuilder-${{ env.PROJECT_VERSION }}-amd64.dmg >> $GITHUB_OUTPUT
env:
MAIN_CLASS: com.oracle.javafx.scenebuilder.app.SceneBuilderApp
JAVAFX_HOME: /tmp/javafx-jmods-${{ inputs.javafx-version }}/
JAVAFX_HOME: /tmp/javafx-jmods-${{ steps.javafx.outputs.JAVAFX_MAJOR_VERSION }}/
JPACKAGE_HOME: ${{ env.JAVA_HOME }}
MACSIGN_PREFIX: ${{ secrets.MACSIGN_PREFIX }}
MACSIGN_USER: ${{ secrets.MACSIGN_USER }}
Expand Down
13 changes: 8 additions & 5 deletions .github/workflows/bundles-mac_aarch64.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ on:
required: true
type: string
java-version:
default: '22'
default: '23'
required: false
type: string
javafx-version:
default: '22'
default: '23'
required: false
type: string
test:
Expand Down Expand Up @@ -53,8 +53,11 @@ jobs:
p12-password: ${{ secrets.CERTIFICATES_PASSWORD }}

- name: Setup JavaFX
id: javafx
run: |
wget -P /tmp https://download2.gluonhq.com/openjfx/${{ inputs.javafx-version }}/openjfx-${{ inputs.javafx-version }}_osx-aarch64_bin-jmods.zip
JAVAFX_MAJOR_VERSION=$(echo ${{ inputs.javafx-version }} | cut -d- -f1)
echo JAVAFX_MAJOR_VERSION=$JAVAFX_MAJOR_VERSION >> $GITHUB_OUTPUT
wget -P /tmp https://download2.gluonhq.com/openjfx/$JAVAFX_MAJOR_VERSION/openjfx-${{ inputs.javafx-version }}_osx-aarch64_bin-jmods.zip
unzip /tmp/openjfx-${{ inputs.javafx-version }}_osx-aarch64_bin-jmods.zip -d /tmp

- name: Cache Maven packages
Expand Down Expand Up @@ -90,10 +93,10 @@ jobs:
--mac-sign
mv ${{ env.INSTALL_DIR }}/SceneBuilder-${{ env.APP_VERSION }}.dmg ${{ env.INSTALL_DIR }}/SceneBuilder-${{ env.PROJECT_VERSION }}-aarch64.dmg
ls ${{ env.INSTALL_DIR }}
echo ::set-output name=path::${{ env.INSTALL_DIR }}/SceneBuilder-${{ env.PROJECT_VERSION }}-aarch64.dmg
echo path=${{ env.INSTALL_DIR }}/SceneBuilder-${{ env.PROJECT_VERSION }}-aarch64.dmg >> $GITHUB_OUTPUT
env:
MAIN_CLASS: com.oracle.javafx.scenebuilder.app.SceneBuilderApp
JAVAFX_HOME: /tmp/javafx-jmods-${{ inputs.javafx-version }}/
JAVAFX_HOME: /tmp/javafx-jmods-${{ steps.javafx.outputs.JAVAFX_MAJOR_VERSION }}/
JPACKAGE_HOME: ${{ env.JAVA_HOME }}
MACSIGN_PREFIX: ${{ secrets.MACSIGN_PREFIX }}
MACSIGN_USER: ${{ secrets.MACSIGN_USER }}
Expand Down
11 changes: 7 additions & 4 deletions .github/workflows/bundles-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ on:
required: true
type: string
java-version:
default: '22'
default: '23'
required: false
type: string
javafx-version:
default: '22'
default: '23'
required: false
type: string
test:
Expand Down Expand Up @@ -42,9 +42,12 @@ jobs:
release: ${{ inputs.java-version }}

- name: Setup JavaFX
id: javafx
shell: pwsh
run: |
Invoke-WebRequest -Uri https://download2.gluonhq.com/openjfx/${{ inputs.javafx-version }}/openjfx-${{ inputs.javafx-version }}_windows-x64_bin-jmods.zip -OutFile D:\openjfx-${{ inputs.javafx-version }}_windows-x64_bin-jmods.zip
$JAVAFX_MAJOR_VERSION = '${{ inputs.javafx-version }}' -split '-' | Select-Object -Index 0
echo "JAVAFX_MAJOR_VERSION=$JAVAFX_MAJOR_VERSION" >> $env:GITHUB_OUTPUT
Invoke-WebRequest -Uri https://download2.gluonhq.com/openjfx/$JAVAFX_MAJOR_VERSION/openjfx-${{ inputs.javafx-version }}_windows-x64_bin-jmods.zip -OutFile D:\openjfx-${{ inputs.javafx-version }}_windows-x64_bin-jmods.zip
Expand-Archive -Force D:\openjfx-${{ inputs.javafx-version }}_windows-x64_bin-jmods.zip D:\

- name: Cache Maven packages
Expand Down Expand Up @@ -75,7 +78,7 @@ jobs:
call dir ${{ env.INSTALL_DIR }}
env:
MAIN_CLASS: com.oracle.javafx.scenebuilder.app.SceneBuilderApp
JAVAFX_HOME: D:\javafx-jmods-${{ inputs.javafx-version }}
JAVAFX_HOME: D:\javafx-jmods-${{ steps.javafx.outputs.JAVAFX_MAJOR_VERSION }}
JPACKAGE_HOME: ${{ env.JAVA_HOME }}
PROJECT_VERSION: ${{ inputs.project-version }}
APP_VERSION: ${{ inputs.app-version }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/early-access.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ on:
branches: [ master ]

env:
JAVAFX_VERSION: '22'
JAVA_VERSION: '22'
JAVA_VERSION: '23'
JAVAFX_VERSION: '23-ea+27'

jobs:
precheck:
Expand Down Expand Up @@ -41,8 +41,8 @@ jobs:
PROJECT_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
APP_VERSION=$PROJECT_VERSION
APP_VERSION=${APP_VERSION%-*}
echo ::set-output name=APP_VERSION::$APP_VERSION
echo ::set-output name=PROJECT_VERSION::$PROJECT_VERSION
echo APP_VERSION=$APP_VERSION >> $GITHUB_OUTPUT
echo PROJECT_VERSION=$PROJECT_VERSION >> $GITHUB_OUTPUT

linux-bundles:
needs: [precheck]
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ on:
- GA

env:
JAVAFX_VERSION: '22'
JAVA_VERSION: '22'
JAVAFX_VERSION: '23'
JAVA_VERSION: '23'

jobs:
precheck:
Expand Down Expand Up @@ -54,9 +54,9 @@ jobs:
S3_PATH=RC/$PROJECT_VERSION
fi
echo "Releasing.. "$PROJECT_VERSION
echo ::set-output name=APP_VERSION::$APP_VERSION
echo ::set-output name=PROJECT_VERSION::$PROJECT_VERSION
echo ::set-output name=S3_PATH::$S3_PATH
echo APP_VERSION=$APP_VERSION >> $GITHUB_OUTPUT
echo PROJECT_VERSION=$PROJECT_VERSION >> $GITHUB_OUTPUT
echo S3_PATH=$S3_PATH >> $GITHUB_OUTPUT

linux-bundles:
needs: [precheck]
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
</modules>

<properties>
<java.version>22</java.version>
<java.version>23</java.version>
<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>22</javafx.version>
<javafx.version>23-ea+27</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>
Expand Down
Loading