From 835a5592fc09c90df89de62e915e28d62b5b5e9a Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Fri, 22 Apr 2022 17:18:28 +0200 Subject: [PATCH] use pwsh for license generation to circumvent slash problem in url --- .github/workflows/win-exe.yml | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/.github/workflows/win-exe.yml b/.github/workflows/win-exe.yml index 9fb5085c5..3a9ed8ab0 100644 --- a/.github/workflows/win-exe.yml +++ b/.github/workflows/win-exe.yml @@ -118,13 +118,14 @@ jobs: - name: Generate license for MSI run: > mvn -B license:add-third-party - -Dlicense.thirdPartyFilename=license.rtf - -Dlicense.outputDirectory=dist/win/resources - -Dlicense.fileTemplate=dist/win/resources/licenseTemplate.ftl - -Dlicense.includedScopes=compile - -Dlicense.excludedGroups=^org\.cryptomator - -Dlicense.failOnMissing=true - -Dlicense.licenseMergesUrl=file:///${{ github.workspace }}/license/merges + "-Dlicense.thirdPartyFilename=license.rtf" + "-Dlicense.outputDirectory=dist/win/resources" + "-Dlicense.fileTemplate=dist/win/resources/licenseTemplate.ftl" + "-Dlicense.includedScopes=compile" + "-Dlicense.excludedGroups=^org\.cryptomator" + "-Dlicense.failOnMissing=true" + "-Dlicense.licenseMergesUrl=file:///${{ github.workspace }}/license/merges" + shell: pwsh - name: Create MSI run: > ${JAVA_HOME}/bin/jpackage @@ -208,13 +209,14 @@ jobs: - name: Generate license for exe run: > mvn -B license:add-third-party - -Dlicense.thirdPartyFilename=license.rtf - -Dlicense.fileTemplate=dist/win/bundle/resources/licenseTemplate.ftl - -Dlicense.outputDirectory=dist/win/bundle/resources - -Dlicense.includedScopes=compile - -Dlicense.excludedGroups=^org\.cryptomator - -Dlicense.failOnMissing=true - -Dlicense.licenseMergesUrl=file:///${{ github.workspace }}/license/merges + "-Dlicense.thirdPartyFilename=license.rtf" + "-Dlicense.fileTemplate=dist/win/bundle/resources/licenseTemplate.ftl" + "-Dlicense.outputDirectory=dist/win/bundle/resources" + "-Dlicense.includedScopes=compile" + "-Dlicense.excludedGroups=^org\.cryptomator" + "-Dlicense.failOnMissing=true" + "-Dlicense.licenseMergesUrl=file:///${{ github.workspace }}/license/merges" + shell: pwsh - name: Download WinFsp run: curl --output dist/win/bundle/resources/winfsp.msi -L ${{ env.WINFSP_MSI }}