From 00a3692dcf0410a1c8e61e3523d57874eb876863 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Mon, 5 Dec 2022 22:59:42 +0100 Subject: [PATCH] final adjustments --- .github/workflows/debian.yml | 2 +- .github/workflows/mac-dmg.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index a39fd346b..8b6a3c956 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -74,7 +74,7 @@ jobs: } $jfxPomVersion = (&mvn help:evaluate "-Dexpression=javafx.version" -q -DforceStdout) -split "\." if ($jfxPomVersion[0] -ne $jfxJmodVersionAmd64[0]) { - Out-Error "Major part of JavaFX version in pom($($jfxPomVersion[0])) does not match the version of Jmods($($jfxJmodVersionAmd64[0])) " + Write-Error "Major part of JavaFX version in pom($($jfxPomVersion[0])) does not match the version of Jmods($($jfxJmodVersionAmd64[0])) " exit 1 } - name: Create orig.tar.gz with common/ libs/ mods/ jmods/ diff --git a/.github/workflows/mac-dmg.yml b/.github/workflows/mac-dmg.yml index 7ce67c772..f2d128566 100644 --- a/.github/workflows/mac-dmg.yml +++ b/.github/workflows/mac-dmg.yml @@ -45,7 +45,7 @@ jobs: architecture: ${{ matrix.architecture }} cache: 'maven' - name: Ensure major jfx version in pom equals in jdk - if: ${{ matrix.architecture}} == 'x64' + if: ${{ !contains(matrix.os, 'self-hosted') }} shell: pwsh run: | $jfxPomVersion = (&mvn help:evaluate "-Dexpression=javafx.version" -q -DforceStdout) -split "\."