Skip to content

Commit

Permalink
bump JDK and JavaFX versions (#752)
Browse files Browse the repository at this point in the history
  • Loading branch information
jperedadnr authored Oct 16, 2024
1 parent 8667b3a commit f3eec2d
Show file tree
Hide file tree
Showing 9 changed files with 62 additions and 27 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ on:
pull_request:

env:
JAVA_VERSION: '23'
JAVA_RELEASE: '23'
JAVA_VERSION: '23.0.1'

jobs:
verify:
Expand All @@ -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'
Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/bundles-kit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
11 changes: 8 additions & 3 deletions .github/workflows/bundles-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
11 changes: 8 additions & 3 deletions .github/workflows/bundles-mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -44,7 +48,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:
Expand Down
11 changes: 8 additions & 3 deletions .github/workflows/bundles-mac_aarch64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
11 changes: 8 additions & 3 deletions .github/workflows/bundles-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
14 changes: 9 additions & 5 deletions .github/workflows/early-access.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,18 @@ on:
branches: [ master ]

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:
Expand All @@ -25,7 +27,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
Expand Down Expand Up @@ -129,7 +132,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
Expand Down
14 changes: 9 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,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.3</charm.glisten.version>
<gluon.attach.version>4.0.21</gluon.attach.version>
Expand Down

0 comments on commit f3eec2d

Please sign in to comment.