|
|
@@ -41,21 +41,32 @@ jobs:
|
|
|
- name: Setup Java
|
|
|
uses: actions/setup-java@v3
|
|
|
with:
|
|
|
- distribution: 'zulu'
|
|
|
+ distribution: 'temurin'
|
|
|
java-version: ${{ env.JAVA_VERSION }}
|
|
|
- java-package: 'jdk+fx'
|
|
|
+ java-package: 'jdk'
|
|
|
architecture: ${{ matrix.architecture }}
|
|
|
cache: 'maven'
|
|
|
- - name: Ensure major jfx version in pom equals in jdk
|
|
|
- if: ${{ !contains(matrix.os, 'self-hosted') }}
|
|
|
- shell: pwsh
|
|
|
+ - name: Download OpenJFX jmods
|
|
|
+ id: download-jmods
|
|
|
run: |
|
|
|
- $jfxPomVersion = (&mvn help:evaluate "-Dexpression=javafx.version" -q -DforceStdout) -split "\."
|
|
|
- $jfxJdkVersion = ((Get-Content -path "${env:JAVA_HOME}/lib/javafx.properties" | Where-Object {$_ -like 'javafx.version=*' }) -replace '.*=','') -split "\."
|
|
|
- if ($jfxPomVersion[0] -ne $jfxJdkVersion[0]) {
|
|
|
- Write-Error "Major part of JavaFX version in pom($($jfxPomVersion[0])) does not match the version in JDK($($jfxJdkVersion[0])) "
|
|
|
+ curl -L ${{ env.OPENJFX_JMODS_URL }} -o openjfx-jmods.zip
|
|
|
+ mkdir -p openjfx-jmods/
|
|
|
+ unzip -j openjfx-jmods.zip \*/javafx.base.jmod \*/javafx.controls.jmod \*/javafx.fxml.jmod \*/javafx.graphics.jmod -d openjfx-jmods
|
|
|
+ env:
|
|
|
+ OPENJFX_JMODS_URL: 'https://download2.gluonhq.com/openjfx/20.0.1/openjfx-20.0.1_osx-${{ matrix.architecture }}_bin-jmods.zip'
|
|
|
+ - name: Ensure major jfx version in pom and in jmods is the same
|
|
|
+ run: |
|
|
|
+ JMOD_VERSION=$(jmod describe openjfx-jmods/javafx.base.jmod | head -1)
|
|
|
+ JMOD_VERSION=${JMOD_VERSION#*@}
|
|
|
+ JMOD_VERSION=${JMOD_VERSION%%.*}
|
|
|
+ POM_JFX_VERSION=$(mvn help:evaluate "-Dexpression=javafx.version" -q -DforceStdout)
|
|
|
+ POM_JFX_VERSION=${POM_JFX_VERSION#*@}
|
|
|
+ POM_JFX_VERSION=${POM_JFX_VERSION%%.*}
|
|
|
+
|
|
|
+ if [ $POM_JFX_VERSION -ne $JMOD_VERSION ]; then
|
|
|
+ >&2 echo "Major JavaFX version in pom.xml (${POM_JFX_VERSION}) != jmod version (${JMOD_VERSION_AMD64})"
|
|
|
exit 1
|
|
|
- }
|
|
|
+ fi
|
|
|
- name: Set version
|
|
|
run : mvn versions:set -DnewVersion=${{ needs.get-version.outputs.semVerStr }}
|
|
|
- name: Run maven
|
Armin Schrenk