Skip to content

Commit ccb7f33

Browse files
committed
fix 102
1 parent c2966c1 commit ccb7f33

1 file changed

Lines changed: 22 additions & 9 deletions

File tree

.github/workflows/build.yml

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,19 @@ jobs:
228228
echo "Copied resources to app bundle"
229229
fi
230230
231+
# Copy icon theme to the app bundle (similar to Windows/Linux)
232+
if [ -d "share/icons" ]; then
233+
mkdir -p "$APP_PATH/Contents/Resources/share/icons"
234+
cp -r share/icons/* "$APP_PATH/Contents/Resources/share/icons/"
235+
echo "Copied icon theme to app bundle"
236+
elif [ -d "../share/icons" ]; then
237+
mkdir -p "$APP_PATH/Contents/Resources/share/icons"
238+
cp -r ../share/icons/* "$APP_PATH/Contents/Resources/share/icons/"
239+
echo "Copied icon theme to app bundle from ../share/icons"
240+
else
241+
echo "Warning: No icon theme found in share/icons or ../share/icons"
242+
fi
243+
231244
# Verify binary is in place
232245
echo "Checking for binary in app bundle:"
233246
ls -la "$APP_PATH/Contents/MacOS/"
@@ -254,7 +267,7 @@ jobs:
254267
if: matrix.config.os == 'macos-latest'
255268
run: |
256269
cd "dist/${{ matrix.config.build_dir }}/usr/bin"
257-
zip -r "../../../../qtedit4-macos-100-qt${{ matrix.qt_version }}-${{ env.version }}.zip" qtedit4.app
270+
zip -r "../../../../qtedit4-macos-101-qt${{ matrix.qt_version }}-${{ env.version }}.zip" qtedit4.app
258271
shell: bash
259272

260273
- name: Create DMG (macOS)
@@ -287,32 +300,32 @@ jobs:
287300
--app-drop-link 425 120 \
288301
--disk-image-size 500 \
289302
--skip-jenkins \
290-
"qtedit4-macos-100-qt${{ matrix.qt_version }}-${{ env.version }}.dmg" \
303+
"qtedit4-macos-101-qt${{ matrix.qt_version }}-${{ env.version }}.dmg" \
291304
"dmg_temp/" || true
292305
293306
# Fallback: create simple DMG if create-dmg fails, with larger size
294-
if [ ! -f "qtedit4-macos-100-qt${{ matrix.qt_version }}-${{ env.version }}.dmg" ]; then
307+
if [ ! -f "qtedit4-macos-101-qt${{ matrix.qt_version }}-${{ env.version }}.dmg" ]; then
295308
echo "create-dmg failed, using hdiutil fallback..."
296-
hdiutil create -volname "QTEdit4" -srcfolder dmg_temp -ov -format UDZO -fs HFS+ -size 500m "qtedit4-macos-100-qt${{ matrix.qt_version }}-${{ env.version }}.dmg"
309+
hdiutil create -volname "QTEdit4" -srcfolder dmg_temp -ov -format UDZO -fs HFS+ -size 500m "qtedit4-macos-101-qt${{ matrix.qt_version }}-${{ env.version }}.dmg"
297310
fi
298311
299312
# Verify final DMG size
300313
echo "Final DMG size:"
301-
ls -lh "qtedit4-macos-100-qt${{ matrix.qt_version }}-${{ env.version }}.dmg"
314+
ls -lh "qtedit4-macos-101-qt${{ matrix.qt_version }}-${{ env.version }}.dmg"
302315
303316
- name: Upload ZIP archive (macOS)
304317
if: matrix.config.os == 'macos-latest'
305318
uses: actions/upload-artifact@v4
306319
with:
307-
name: qtedit4-macos-100-qt${{ matrix.qt_version }}-${{ env.version }}.zip
308-
path: qtedit4-macos-100-qt${{ matrix.qt_version }}-${{ env.version }}.zip
320+
name: qtedit4-macos-101-qt${{ matrix.qt_version }}-${{ env.version }}.zip
321+
path: qtedit4-macos-101-qt${{ matrix.qt_version }}-${{ env.version }}.zip
309322

310323
- name: Upload DMG (macOS)
311324
if: matrix.config.os == 'macos-latest'
312325
uses: actions/upload-artifact@v4
313326
with:
314-
name: qtedit4-macos-100-qt${{ matrix.qt_version }}-${{ env.version }}.dmg
315-
path: qtedit4-macos-100-qt${{ matrix.qt_version }}-${{ env.version }}.dmg
327+
name: qtedit4-macos-101-qt${{ matrix.qt_version }}-${{ env.version }}.dmg
328+
path: qtedit4-macos-101-qt${{ matrix.qt_version }}-${{ env.version }}.dmg
316329

317330

318331
create-release:

0 commit comments

Comments
 (0)