From b1d48bb333eac17abde82e120fedbece40838ee7 Mon Sep 17 00:00:00 2001 From: Richard Hansen Date: Fri, 13 May 2022 17:49:53 -0400 Subject: [PATCH] Windows build: Extract .zip outside repo clone --- .github/workflows/windows-installer.yml | 3 ++- src/bin/nsis/etherpad.nsi | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows-installer.yml b/.github/workflows/windows-installer.yml index 30a5b8946..44253bf06 100644 --- a/.github/workflows/windows-installer.yml +++ b/.github/workflows/windows-installer.yml @@ -44,7 +44,8 @@ jobs: run: src/bin/buildForWindows.sh - name: Extract the .zip into folder - run: 7z x etherpad-win.zip -oetherpad-lite-new + working-directory: .. + run: 7z x etherpad-lite\etherpad-win.zip -oetherpad-zip - name: Create installer uses: joncloud/makensis-action@v3.6 diff --git a/src/bin/nsis/etherpad.nsi b/src/bin/nsis/etherpad.nsi index 9e9e049c7..28003ac18 100644 --- a/src/bin/nsis/etherpad.nsi +++ b/src/bin/nsis/etherpad.nsi @@ -24,7 +24,7 @@ Section SetOutPath $INSTDIR ; Put files there - File /r "..\..\..\etherpad-lite-new\*" + File /r "..\..\..\..\etherpad-zip\*" SectionEnd