Skip to content

Commit 6d878fe

Browse files
authored
fix(build): escape installer newline, upload installers and executables (#860)
* escape newline in inno script * upload installers and executables
1 parent 21e5de1 commit 6d878fe

File tree

2 files changed

+23
-7
lines changed

2 files changed

+23
-7
lines changed

.github/workflows/release-and-publish.yml

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,18 @@ jobs:
4444
brew install nvm
4545
poetry run postinstall
4646
brew install [email protected]
47-
- name: Build executables
47+
- name: Build MacOS executable
4848
run: |
4949
poetry run python -m openadapt.build
50-
- name: Upload executables
50+
cd dist
51+
zip -r ../OpenAdapt.app.zip OpenAdapt.app
52+
cd ..
53+
- name: Upload MacOS executable
54+
uses: actions/upload-artifact@v4
55+
with:
56+
name: OpenAdapt.app
57+
path: OpenAdapt.app.zip
58+
- name: Upload MacOS installer
5159
uses: actions/upload-artifact@v4
5260
with:
5361
name: OpenAdapt.dmg
@@ -80,14 +88,22 @@ jobs:
8088
cd ../../../
8189
pip install wheel
8290
poetry run postinstall
83-
- name: Build executables
91+
- name: Build Windows executable
8492
run: |
8593
poetry run python -m openadapt.build
86-
- name: Upload executables
94+
cd dist
95+
7z a -tzip ../OpenAdapt.zip OpenAdapt
96+
cd ..
97+
- name: Upload Windows executable
98+
uses: actions/upload-artifact@v4
99+
with:
100+
name: OpenAdapt
101+
path: OpenAdapt.zip
102+
- name: Upload Windows installer
87103
uses: actions/upload-artifact@v4
88104
with:
89105
name: OpenAdapt_Installer
90-
path: OpenAdapt_Installer
106+
path: OpenAdapt_Installer.exe
91107

92108
test_on_macos:
93109
name: Test on macOS

openadapt/build.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,8 +243,8 @@ def create_windows_installer() -> None:
243243
OutputDir={ROOT_DIR / "dist"}
244244
245245
[Files]
246-
Source: "{DIST_DIR}\\*"; DestDir: "{{app}}";
247-
Flags: ignoreversion recursesubdirs createallsubdirs
246+
Source: "{DIST_DIR}\\*"; DestDir: "{{app}}"; \
247+
Flags: ignoreversion recursesubdirs createallsubdirs
248248
249249
[Icons]
250250
Name: "{{group}}\\OpenAdapt"; Filename: "{{app}}\\OpenAdapt.exe"

0 commit comments

Comments
 (0)