From 0db6826a2c509d231fd0278d7c39b88fe4300ae8 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Thu, 29 Jun 2023 23:52:46 +0200 Subject: [PATCH 1/2] Try to fix gradle call --- .github/workflows/deployment.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml index a0d4bb506a6..ff9bb28ac2a 100644 --- a/.github/workflows/deployment.yml +++ b/.github/workflows/deployment.yml @@ -91,7 +91,7 @@ jobs: echo "JDK21=${{runner.temp}}\jdk\jdk-21" >> "$GITHUB_ENV" ls "$(cygpath -u "$RUNNER_TEMP\jdk\jdk-21")" - echo "org.gradle.java.installations.paths=${{runner.temp}}\jdk\jdk-21" >> gradle.properties + echo "org.gradle.java.installations.paths=${{runner.temp}}\jdk\jdk-21" | sed "s/\\\\/\\\\\\\\/" >> gradle.properties echo "org.gradle.java.installations.auto-detect=false" >> gradle.properties cat gradle.properties @@ -143,10 +143,10 @@ jobs: - name: Build runtime image if: (matrix.os != 'macos-latest') || (steps.checksecrets.outputs.secretspresent == 'YES') shell: bash - run: ./gradlew -Porg.gradle.java.installations.paths="${{env.JDK21}}" -i -PprojVersion="${{ steps.gitversion.outputs.AssemblySemVer }}" -PprojVersionInfo="${{ steps.gitversion.outputs.InformationalVersion }}" jlinkZip + run: ./gradlew -i -PprojVersion="${{ steps.gitversion.outputs.AssemblySemVer }}" -PprojVersionInfo="${{ steps.gitversion.outputs.InformationalVersion }}" jlinkZip - name: Build installer if: (matrix.os != 'macos-latest') || (steps.checksecrets.outputs.secretspresent == 'YES') - run: ./gradlew -Porg.gradle.java.installations.paths="${{env.JDK21}}" -i -PprojVersion="${{ steps.gitversion.outputs.AssemblySemVer }}" -PprojVersionInfo="${{ steps.gitversion.outputs.InformationalVersion }}" jpackage + run: ./gradlew -i -PprojVersion="${{ steps.gitversion.outputs.AssemblySemVer }}" -PprojVersionInfo="${{ steps.gitversion.outputs.InformationalVersion }}" jpackage shell: bash - name: Resign app image for OSX and build dmg if: (matrix.os == 'macos-latest') && (steps.checksecrets.outputs.secretspresent == 'YES') From 0b1813d245d44278d193b5707368d0bb74ca98a4 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Fri, 30 Jun 2023 00:10:12 +0200 Subject: [PATCH 2/2] Fix fix --- .github/workflows/deployment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml index ff9bb28ac2a..5db32beef29 100644 --- a/.github/workflows/deployment.yml +++ b/.github/workflows/deployment.yml @@ -91,7 +91,7 @@ jobs: echo "JDK21=${{runner.temp}}\jdk\jdk-21" >> "$GITHUB_ENV" ls "$(cygpath -u "$RUNNER_TEMP\jdk\jdk-21")" - echo "org.gradle.java.installations.paths=${{runner.temp}}\jdk\jdk-21" | sed "s/\\\\/\\\\\\\\/" >> gradle.properties + echo "org.gradle.java.installations.paths=${{runner.temp}}\jdk\jdk-21" | sed "s/\\\\/\\\\\\\\/g" >> gradle.properties echo "org.gradle.java.installations.auto-detect=false" >> gradle.properties cat gradle.properties