From 9301a3186c431fe780d4a7ec16fc1f0b78360a6d Mon Sep 17 00:00:00 2001 From: Richard Abrich Date: Fri, 19 Jul 2024 11:04:53 -0400 Subject: [PATCH 1/2] escape newline in inno script --- openadapt/build.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openadapt/build.py b/openadapt/build.py index d5049d441..13775899c 100644 --- a/openadapt/build.py +++ b/openadapt/build.py @@ -243,8 +243,8 @@ def create_windows_installer() -> None: OutputDir={ROOT_DIR / "dist"} [Files] -Source: "{DIST_DIR}\\*"; DestDir: "{{app}}"; -Flags: ignoreversion recursesubdirs createallsubdirs +Source: "{DIST_DIR}\\*"; DestDir: "{{app}}"; \ + Flags: ignoreversion recursesubdirs createallsubdirs [Icons] Name: "{{group}}\\OpenAdapt"; Filename: "{{app}}\\OpenAdapt.exe" From 6c77156e917abd5f36239b46df1624d687ebc66b Mon Sep 17 00:00:00 2001 From: Richard Abrich Date: Fri, 19 Jul 2024 11:14:47 -0400 Subject: [PATCH 2/2] upload installers and executables --- .github/workflows/release-and-publish.yml | 26 ++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release-and-publish.yml b/.github/workflows/release-and-publish.yml index 915c83be2..06f80bbd7 100644 --- a/.github/workflows/release-and-publish.yml +++ b/.github/workflows/release-and-publish.yml @@ -44,10 +44,18 @@ jobs: brew install nvm poetry run postinstall brew install python-tk@3.10 - - name: Build executables + - name: Build MacOS executable run: | poetry run python -m openadapt.build - - name: Upload executables + cd dist + zip -r ../OpenAdapt.app.zip OpenAdapt.app + cd .. + - name: Upload MacOS executable + uses: actions/upload-artifact@v4 + with: + name: OpenAdapt.app + path: OpenAdapt.app.zip + - name: Upload MacOS installer uses: actions/upload-artifact@v4 with: name: OpenAdapt.dmg @@ -80,14 +88,22 @@ jobs: cd ../../../ pip install wheel poetry run postinstall - - name: Build executables + - name: Build Windows executable run: | poetry run python -m openadapt.build - - name: Upload executables + cd dist + 7z a -tzip ../OpenAdapt.zip OpenAdapt + cd .. + - name: Upload Windows executable + uses: actions/upload-artifact@v4 + with: + name: OpenAdapt + path: OpenAdapt.zip + - name: Upload Windows installer uses: actions/upload-artifact@v4 with: name: OpenAdapt_Installer - path: OpenAdapt_Installer + path: OpenAdapt_Installer.exe test_on_macos: name: Test on macOS