From 794704668cbda0441192d918f0fa240831dcbbe0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Pereda?= Date: Mon, 30 Sep 2024 21:29:29 +0200 Subject: [PATCH 1/4] build: Update bundles-mac.yml (#735, #736) Run workflow on macOS-13 for Intel build --- .github/workflows/bundles-mac.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bundles-mac.yml b/.github/workflows/bundles-mac.yml index eba604c32..61fed6407 100644 --- a/.github/workflows/bundles-mac.yml +++ b/.github/workflows/bundles-mac.yml @@ -36,7 +36,7 @@ on: required: true jobs: build: - runs-on: macos-latest + runs-on: macos-13 steps: - uses: actions/checkout@v4 From b8cac7f66d2de91d55c7dc1ba7f49a6e37752234 Mon Sep 17 00:00:00 2001 From: "jose.pereda" Date: Wed, 16 Oct 2024 12:13:30 +0200 Subject: [PATCH 2/4] bump jdk and javafx versions --- .github/workflows/build.yml | 2 +- .github/workflows/bundles-kit.yml | 2 +- .github/workflows/bundles-linux.yml | 4 ++-- .github/workflows/bundles-mac.yml | 4 ++-- .github/workflows/bundles-mac_aarch64.yml | 4 ++-- .github/workflows/bundles-windows.yml | 4 ++-- .github/workflows/early-access.yml | 4 ++-- .github/workflows/release.yml | 4 ++-- pom.xml | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 455b5ff9f..6853c2ac6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,7 +3,7 @@ on: pull_request: env: - JAVA_VERSION: '23' + JAVA_VERSION: '23.0.1' jobs: verify: diff --git a/.github/workflows/bundles-kit.yml b/.github/workflows/bundles-kit.yml index 16f0cb9b4..d618622ea 100644 --- a/.github/workflows/bundles-kit.yml +++ b/.github/workflows/bundles-kit.yml @@ -7,7 +7,7 @@ on: required: true type: string java-version: - default: '23' + default: '23.0.1' required: false type: string diff --git a/.github/workflows/bundles-linux.yml b/.github/workflows/bundles-linux.yml index 2c2779f29..a6247b424 100644 --- a/.github/workflows/bundles-linux.yml +++ b/.github/workflows/bundles-linux.yml @@ -10,11 +10,11 @@ on: required: true type: string java-version: - default: '23' + default: '23.0.1' required: false type: string javafx-version: - default: '23' + default: '23.0.1' required: false type: string test: diff --git a/.github/workflows/bundles-mac.yml b/.github/workflows/bundles-mac.yml index 61fed6407..2ea50d45c 100644 --- a/.github/workflows/bundles-mac.yml +++ b/.github/workflows/bundles-mac.yml @@ -10,11 +10,11 @@ on: required: true type: string java-version: - default: '23' + default: '23.0.1' required: false type: string javafx-version: - default: '23' + default: '23.0.1' required: false type: string test: diff --git a/.github/workflows/bundles-mac_aarch64.yml b/.github/workflows/bundles-mac_aarch64.yml index c59950aa1..902286d34 100644 --- a/.github/workflows/bundles-mac_aarch64.yml +++ b/.github/workflows/bundles-mac_aarch64.yml @@ -10,11 +10,11 @@ on: required: true type: string java-version: - default: '23' + default: '23.0.1' required: false type: string javafx-version: - default: '23' + default: '23.0.1' required: false type: string test: diff --git a/.github/workflows/bundles-windows.yml b/.github/workflows/bundles-windows.yml index a4009f006..3aaddc8cb 100644 --- a/.github/workflows/bundles-windows.yml +++ b/.github/workflows/bundles-windows.yml @@ -10,11 +10,11 @@ on: required: true type: string java-version: - default: '23' + default: '23.0.1' required: false type: string javafx-version: - default: '23' + default: '23.0.1' required: false type: string test: diff --git a/.github/workflows/early-access.yml b/.github/workflows/early-access.yml index ef2bcb60b..c8c6cf921 100644 --- a/.github/workflows/early-access.yml +++ b/.github/workflows/early-access.yml @@ -5,8 +5,8 @@ on: branches: [ master ] env: - JAVAFX_VERSION: '23' - JAVA_VERSION: '23' + JAVAFX_VERSION: '23.0.1' + JAVA_VERSION: '23.0.1' jobs: precheck: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 49b800eba..a9c1fb2da 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,8 +11,8 @@ on: - GA env: - JAVAFX_VERSION: '23' - JAVA_VERSION: '23' + JAVAFX_VERSION: '23.0.1' + JAVA_VERSION: '23.0.1' jobs: precheck: diff --git a/pom.xml b/pom.xml index 40fe20d87..52c6234ef 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ ${java.version} ${java.version} ${java.version} - 23 + 23.0.1 1.1.0 6.2.2 4.0.19 From 6f8fd752045828da14271252a7253819d86fb209 Mon Sep 17 00:00:00 2001 From: "jose.pereda" Date: Wed, 16 Oct 2024 12:15:58 +0200 Subject: [PATCH 3/4] increment version to 23.0.1-SNAPSHOT --- app/pom.xml | 2 +- kit/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/pom.xml b/app/pom.xml index 22288a872..2442cfbed 100644 --- a/app/pom.xml +++ b/app/pom.xml @@ -7,7 +7,7 @@ com.gluonhq.scenebuilder parent - 23.0.0-SNAPSHOT + 23.0.1-SNAPSHOT diff --git a/kit/pom.xml b/kit/pom.xml index 174e821f7..da2c53c7b 100644 --- a/kit/pom.xml +++ b/kit/pom.xml @@ -7,7 +7,7 @@ com.gluonhq.scenebuilder parent - 23.0.0-SNAPSHOT + 23.0.1-SNAPSHOT diff --git a/pom.xml b/pom.xml index 52c6234ef..389eb9995 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.gluonhq.scenebuilder parent pom - 23.0.0-SNAPSHOT + 23.0.1-SNAPSHOT Scene Builder Scene Builder is a visual, drag n drop, layout tool for designing JavaFX application user interfaces 2012 From f8c63423fa8735144d472ab1109e4f62cbbe34d9 Mon Sep 17 00:00:00 2001 From: "jose.pereda" Date: Wed, 16 Oct 2024 12:31:09 +0200 Subject: [PATCH 4/4] update jobs with java release and java version --- .github/workflows/build.yml | 4 +++- .github/workflows/bundles-kit.yml | 7 ++++++- .github/workflows/bundles-linux.yml | 7 ++++++- .github/workflows/bundles-mac.yml | 7 ++++++- .github/workflows/bundles-mac_aarch64.yml | 7 ++++++- .github/workflows/bundles-windows.yml | 7 ++++++- .github/workflows/early-access.yml | 12 ++++++++---- .github/workflows/release.yml | 12 ++++++++---- 8 files changed, 49 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6853c2ac6..7e5e9b453 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,6 +3,7 @@ on: pull_request: env: + JAVA_RELEASE: '23' JAVA_VERSION: '23.0.1' jobs: @@ -20,7 +21,8 @@ jobs: uses: oracle-actions/setup-java@v1.4.0 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 index d618622ea..d4f7c2704 100644 --- a/.github/workflows/bundles-kit.yml +++ b/.github/workflows/bundles-kit.yml @@ -6,6 +6,10 @@ on: project-version: required: true type: string + java-release: + default: '23' + required: false + type: string java-version: default: '23.0.1' required: false @@ -21,7 +25,8 @@ jobs: uses: oracle-actions/setup-java@v1.4.0 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 index a6247b424..68dfce3ce 100644 --- a/.github/workflows/bundles-linux.yml +++ b/.github/workflows/bundles-linux.yml @@ -9,6 +9,10 @@ on: project-version: required: true type: string + java-release: + default: '23' + required: false + type: string java-version: default: '23.0.1' required: false @@ -35,7 +39,8 @@ jobs: uses: oracle-actions/setup-java@v1.4.0 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 index 2ea50d45c..cd9cea1cc 100644 --- a/.github/workflows/bundles-mac.yml +++ b/.github/workflows/bundles-mac.yml @@ -9,6 +9,10 @@ on: project-version: required: true type: string + java-release: + default: '23' + required: false + type: string java-version: default: '23.0.1' required: false @@ -44,7 +48,8 @@ jobs: uses: oracle-actions/setup-java@v1.4.0 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 index 902286d34..16d80b6b6 100644 --- a/.github/workflows/bundles-mac_aarch64.yml +++ b/.github/workflows/bundles-mac_aarch64.yml @@ -9,6 +9,10 @@ on: project-version: required: true type: string + java-release: + default: '23' + required: false + type: string java-version: default: '23.0.1' required: false @@ -45,7 +49,8 @@ jobs: uses: oracle-actions/setup-java@v1.4.0 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 index 3aaddc8cb..ede5252e0 100644 --- a/.github/workflows/bundles-windows.yml +++ b/.github/workflows/bundles-windows.yml @@ -9,6 +9,10 @@ on: project-version: required: true type: string + java-release: + default: '23' + required: false + type: string java-version: default: '23.0.1' required: false @@ -39,7 +43,8 @@ jobs: uses: oracle-actions/setup-java@v1.4.0 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 index c8c6cf921..5f7a2420d 100644 --- a/.github/workflows/early-access.yml +++ b/.github/workflows/early-access.yml @@ -5,16 +5,18 @@ on: branches: [ master ] env: - JAVAFX_VERSION: '23.0.1' + 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 +27,8 @@ jobs: uses: oracle-actions/setup-java@v1.4.0 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 +132,8 @@ jobs: uses: oracle-actions/setup-java@v1.4.0 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 index a9c1fb2da..36bf7b2d3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,15 +11,17 @@ on: - GA env: - JAVAFX_VERSION: '23.0.1' + 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/setup-java@v1.4.0 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/setup-java@v1.4.0 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