From b2b49f4d2f3fe8d519c687d3c424fd40e38c59ed Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Mon, 5 Dec 2022 16:49:19 +0100 Subject: [PATCH] use correct pwsh syntax on all publish workflows --- .github/workflows/appimage.yml | 2 +- .github/workflows/debian.yml | 12 ++++++------ .github/workflows/mac-dmg.yml | 8 ++++---- .github/workflows/win-exe.yml | 8 ++++---- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml index 6bba24bbe..a3502145a 100644 --- a/.github/workflows/appimage.yml +++ b/.github/workflows/appimage.yml @@ -36,7 +36,7 @@ jobs: 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) { + 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])) " exit 1 } diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index fc066c9af..8eb75908b 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -64,15 +64,15 @@ jobs: - name: Ensure major jfx version in pom and in jmods is the same shell: pwsh run: | - $jfxPomVersion = (&mvn help:evaluate -Dexpression=javafx.version -q -DforceStdout) -split "\." - $jfxJmodVersionAmd64 = (Get-Content -Path "jmods/aarch64/javafx.properties" | Where-Object {$_ -like 'javafx.version=*' }) -replace '.*=','' - $jfxJmodVersionAarch64 = (Get-Content -Path "jmods/aarch64/javafx.properties" | Where-Object {$_ -like 'javafx.version=*' }) -replace '.*=','' - if ($jfxJmodVersionAmd64 -ne $jfxJmodVersionAarch64 ) { + $jfxPomVersion = (&mvn help:evaluate "-Dexpression=javafx.version" -q -DforceStdout) -split "\." + $jfxJmodVersionAmd64 = ((Get-Content -Path "jmods/aarch64/javafx.properties" | Where-Object {$_ -like 'javafx.version=*' }) -replace '.*=','') -split "\." + $jfxJmodVersionAarch64 = ((Get-Content -Path "jmods/aarch64/javafx.properties" | Where-Object {$_ -like 'javafx.version=*' }) -replace '.*=','') -split "\." + if ($jfxJmodVersionAmd64[0] -ne $jfxJmodVersionAarch64[0] ) { Write-Error "JavaFX Jmods for aarch64 and amd64 are different major versions" exit 1 } - if ($jfxPomVersion[0] -ne $jfxJmodVersionAmd64) { - Out-Error "Major part of JavaFX version in pom($($jfxPomVersion[0])) does not match the version of Jmods(${jfxJmodVersion}) " + 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])) " 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 03083bb7c..ee27624c9 100644 --- a/.github/workflows/mac-dmg.yml +++ b/.github/workflows/mac-dmg.yml @@ -47,10 +47,10 @@ jobs: - name: Ensure major jfx version in pom equals in jdk shell: pwsh 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 '.*=','' - if ($jfxPomVersion[0] -ne $jfxJdkVersion) { - Write-Error "Major part of JavaFX version in pom($($jfxPomVersion[0])) does not match the version in JDK(${jfxJdkVersion}) " + $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])) " exit 1 } - name: Set version diff --git a/.github/workflows/win-exe.yml b/.github/workflows/win-exe.yml index 978818136..1ccf7a560 100644 --- a/.github/workflows/win-exe.yml +++ b/.github/workflows/win-exe.yml @@ -42,10 +42,10 @@ jobs: - name: Ensure major jfx version in pom equals in jdk shell: pwsh 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 '.*=','' - if ($jfxPomVersion[0] -ne $jfxJdkVersion) { - Write-Error "Major part of JavaFX version in pom($($jfxPomVersion[0])) does not match the version in JDK(${jfxJdkVersion}) " + $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])) " exit 1 } - name: Set version