update workflows

This commit is contained in:
Armin Schrenk
2023-05-08 19:41:58 +02:00
parent a3f05db189
commit 6386dd3d50
8 changed files with 25 additions and 13 deletions

View File

@@ -10,7 +10,7 @@ on:
required: false
env:
JAVA_VERSION: 19
JAVA_VERSION: 20
jobs:
get-version:

View File

@@ -6,7 +6,7 @@ on:
types: [labeled]
env:
JAVA_VERSION: 19
JAVA_VERSION: 20
defaults:
run:

View File

@@ -19,9 +19,11 @@ on:
type: boolean
env:
JAVA_VERSION: 19
OPENJFX_JMODS_AMD64: 'https://download2.gluonhq.com/openjfx/19.0.2.1/openjfx-19.0.2.1_linux-x64_bin-jmods.zip'
OPENJFX_JMODS_AARCH64: 'https://download2.gluonhq.com/openjfx/19.0.2.1/openjfx-19.0.2.1_linux-aarch64_bin-jmods.zip'
JAVA_VERSION: 20
OPENJFX_JMODS_AMD64: 'https://download2.gluonhq.com/openjfx/20.0.1/openjfx-20.0.1_linux-x64_bin-jmods.zip'
JMODS_AMD64_HASH: '0b244b08354dc5e1b639765fd0858cbc154774e9cb05467c4111b7c63d3b3721'
OPENJFX_JMODS_AARCH64: 'https://download2.gluonhq.com/openjfx/20.0.1/openjfx-20.0.1_linux-aarch64_bin-jmods.zip'
JMODS_AARCH64_HASH: '4b0dd30282c067aa07fe840374115b5ec5dcfd8dc479ebd2231dfdb6a518b3b3'
jobs:
build:
@@ -58,9 +60,19 @@ jobs:
id: download-jmods
run: |
curl -L ${{ env.OPENJFX_JMODS_AMD64 }} -o openjfx-amd64.zip
echo "${{ env.JMODS_AMD64_HASH }} openjfx-amd64.zip" | sha256sum -c
if [ $? != 0 ]; then
echo "Wrong checksum of JMOD archive downloaded from ${{ env.OPENJFX_JMODS_AMD64 }}.";
exit 1
fi
mkdir -p jmods/amd64
unzip -j openjfx-amd64.zip \*/javafx.base.jmod \*/javafx.controls.jmod \*/javafx.fxml.jmod \*/javafx.graphics.jmod -d jmods/amd64
curl -L ${{ env.OPENJFX_JMODS_AARCH64 }} -o openjfx-aarch64.zip
echo "${{ env.JMODS_AARCH64_HASH }} openjfx-aarch64.zip" | sha256sum -c
if [ $? != 0 ]; then
echo "Wrong checksum of JMOD archive downloaded from ${{ env.OPENJFX_JMODS_AARCH64 }}.";
exit 1
fi
mkdir -p jmods/aarch64
unzip -j openjfx-aarch64.zip \*/javafx.base.jmod \*/javafx.controls.jmod \*/javafx.fxml.jmod \*/javafx.graphics.jmod -d jmods/aarch64
- name: Ensure major jfx version in pom and in jmods is the same

View File

@@ -22,7 +22,7 @@ on:
value: ${{ jobs.determine-version.outputs.type }}
env:
JAVA_VERSION: 19
JAVA_VERSION: 20
JAVA_DIST: 'temurin'
JAVA_CACHE: 'maven'

View File

@@ -10,7 +10,7 @@ on:
required: false
env:
JAVA_VERSION: 19
JAVA_VERSION: 20
jobs:
get-version:

View File

@@ -4,7 +4,7 @@ on:
pull_request:
env:
JAVA_VERSION: 19
JAVA_VERSION: 20
defaults:
run:

View File

@@ -7,7 +7,7 @@ on:
- 'hotfix/**'
env:
JAVA_VERSION: 19
JAVA_VERSION: 20
defaults:
run:

View File

@@ -14,11 +14,11 @@ on:
env:
JAVA_VERSION: 19
JAVA_VERSION: 20
JAVA_DIST: 'temurin'
JAVA_CACHE: 'maven'
JFX_JMODS_URL: 'https://download2.gluonhq.com/openjfx/19.0.2.1/openjfx-19.0.2.1_windows-x64_bin-jmods.zip'
JFX_JMODS_HASH: 'B7CF2CAD2468842B3B78D99F6C0555771499A36FA1F1EE3DD1B9A4597F1FAB86'
JFX_JMODS_URL: 'https://download2.gluonhq.com/openjfx/20.0.1/openjfx-20.0.1_windows-x64_bin-jmods.zip'
JFX_JMODS_HASH: 'D00767334C43B8832B5CF10267D34CA8F563D187C4655B73EB6020DD79C054B5'
defaults:
run:
@@ -51,7 +51,7 @@ jobs:
run: |
curl --output jfxjmods.zip -L "${{ env.JFX_JMODS_URL }}"
if(!(Get-FileHash -Path jfxjmods.zip -Algorithm SHA256).Hash.equals("${{ env.JFX_JMODS_HASH }}")) {
exit 1;
throw "Wrong checksum of JMOD archive downloaded from ${{ env.JFX_JMODS_URL }}.";
}
Expand-Archive -Path jfxjmods.zip -DestinationPath jfxjmods
Get-ChildItem -Path jfxjmods -Recurse -Filter "*.jmod" | ForEach-Object { Move-Item -Path $_ -Destination $_.Directory.Parent}