Skip to content

Commit

Permalink
fix(build): escape installer newline, upload installers and executabl…
Browse files Browse the repository at this point in the history
…es (#860)

* escape newline in inno script

* upload installers and executables
  • Loading branch information
abrichr authored Jul 19, 2024
1 parent 21e5de1 commit 6d878fe
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 7 deletions.
26 changes: 21 additions & 5 deletions .github/workflows/release-and-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,18 @@ jobs:
brew install nvm
poetry run postinstall
brew install [email protected]
- 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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions openadapt/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 6d878fe

Please sign in to comment.