Skip to content

Commit eb579be

Browse files
committed
Try MacOS fix
1 parent 08aba77 commit eb579be

File tree

1 file changed

+12
-8
lines changed

1 file changed

+12
-8
lines changed

.github/workflows/Create_installer.yml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ jobs:
2121
# 4. <MacOS 14 with arm64 arch, Release, Clang 15 compiler toolchain
2222
# To add more build types (Release, Debug, RelWithDebInfo, etc.) customize the list.
2323
matrix:
24-
# os: [windows-2022, ubuntu-22.04, macos-14, macos-15-intel]
25-
os: [windows-2022]
24+
os: [windows-2022, ubuntu-22.04, macos-14, macos-15-intel]
2625

2726
steps:
2827
- name: Checkout EasyImaginApp
@@ -51,10 +50,6 @@ jobs:
5150
shell: bash
5251
run: uv pip install -r imaging-app/pyproject.toml --extra ci --system
5352

54-
- name: Downgrade pyinstaller (MacOS)
55-
if: runner.os == 'macOS'
56-
run: uv pip install 'pyinstaller<6.0' --system
57-
5853
- name: Install Qt Installer Framework
5954
uses: jurplel/install-qt-action@v4
6055
with:
@@ -64,13 +59,22 @@ jobs:
6459
tools: 'tools_ifw'
6560
no-qt-binaries: 'true'
6661

62+
- name: Set icon environment variable
63+
shell: bash
64+
run: |
65+
if [ "${{ runner.os }}" == "Windows" ]; then
66+
echo "ICON_PATH=EasyImagingApp\Gui\Resources\Logos\App.ico" >> $GITHUB_ENV
67+
else
68+
echo "ICON_PATH=EasyImagingApp/Gui/Resources/Logos/App.icns" >> $GITHUB_ENV
69+
fi
70+
6771
- name: Build with pyinstaller
6872
working-directory: imaging-app
6973
shell: bash
7074
run: |
71-
pyinstaller EasyImagingApp/main.py --onedir --windowed --name EasyImaging --icon EasyImagingApp/Gui/Resources/Logos/App.ico \
75+
pyinstaller EasyImagingApp/main.py --onedir --windowed --name EasyImaging --icon $ICON_PATH \
7276
--clean --noconfirm \
73-
--add-data=EasyImagingApp:. --collect-all PySide6 --collect-all scitiff --collect-all easyscience --collect-all EasyApp
77+
--add-data=EasyImagingApp:. --collect-submodules PySide6 --collect-all scitiff --collect-all easyscience --collect-all EasyApp
7478
7579
- name: Upload artifact
7680
uses: actions/upload-artifact@v4

0 commit comments

Comments
 (0)