Skip to content

Fix/installer #860

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
abrichr merged 2 commits into from
Jul 19, 2024
Merged

Fix/installer #860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9301a31
escape newline in inno script
abrichr Jul 19, 2024
6c77156
upload installers and executables
abrichr Jul 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 21 additions & 5 deletions .github/workflows/release-and-publish.yml
View file
Open in desktop
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 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
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
View file
Open in desktop
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