Skip to content

Commit b65f478

Browse files
committed
Fix workflows.
1 parent 55ef7cb commit b65f478

4 files changed

Lines changed: 13 additions & 5 deletions

File tree

.github/workflows/build-appimage.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ jobs:
1414
permissions:
1515
contents: read
1616
id-token: write
17+
attestations: write
1718
steps:
1819
- uses: actions/checkout@v4
1920
with:
@@ -29,7 +30,7 @@ jobs:
2930
with:
3031
version: 6.10.0
3132
dir: ..
32-
modules: qtshadertools
33+
modules: qt5compat qtshadertools
3334
setup-python: false
3435
cache: true
3536

.github/workflows/build-dmg.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ jobs:
1414
permissions:
1515
contents: read
1616
id-token: write
17+
attestations: write
1718
steps:
1819
- uses: actions/checkout@v4
1920
with:
@@ -23,7 +24,7 @@ jobs:
2324
uses: jurplel/install-qt-action@v4
2425
with:
2526
version: 6.10.*
26-
modules: qtshadertools
27+
modules: qt5compat qtshadertools
2728
setup-python: true
2829
python-version: '3.11'
2930
cache: true

qmltermwidget

scripts/build-dmg.sh

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,15 @@ mkdir -p "$APP/Contents/PlugIns"
3333
cp -R qmltermwidget/QMLTermWidget "$PLUGIN_DST"
3434

3535
export QML_IMPORT_PATH="$PWD/$APP/Contents/PlugIns"
36-
"$QT_BIN/macdeployqt" "$APP" -qmldir="$QML_DIR" -dmg
36+
"$QT_BIN/macdeployqt" "$APP" -qmldir="$QML_DIR"
37+
38+
# Remove stale signatures and ad-hoc sign so Gatekeeper doesn't report corruption.
39+
codesign --remove-signature "$APP" 2>/dev/null || true
40+
rm -rf "$APP/Contents/_CodeSignature"
41+
codesign --force --deep --sign - "$APP"
3742

3843
rm -f "$APP/Contents/PlugIns/sqldrivers/"libqsql{odbc,psql,mimer}.dylib 2>/dev/null || true
3944
DMG_OUT="${APP%.app}-${VERSION}.dmg"
40-
mv "$BUILD_DIR/${APP%.app}.dmg" "$OLD_CWD/$DMG_OUT"
45+
hdiutil create -volname "${APP%.app}" -srcfolder "$APP" -ov -format UDZO "$DMG_OUT"
46+
mv "$BUILD_DIR/$DMG_OUT" "$OLD_CWD/$DMG_OUT"
4147
popd

0 commit comments

Comments
 (0)