Skip to content

Commit f0430e0

Browse files
fix appimage build (flameshot-org#3379)
1 parent fa29bcb commit f0430e0

File tree

1 file changed

+15
-14
lines changed

1 file changed

+15
-14
lines changed

.github/workflows/Linux-pack.yml

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -326,8 +326,7 @@ jobs:
326326
path: |
327327
${{ github.workspace }}/build/${{ env.PRODUCT }}-*-lp${{ matrix.dist.symbol }}.${{ matrix.dist.arch }}.rpm
328328
${{ github.workspace }}/build/${{ env.PRODUCT }}-*-lp${{ matrix.dist.symbol }}.${{ matrix.dist.arch }}.rpm.sha256sum
329-
330-
appimage-pack:
329+
appimage-pack:
331330
name: Build appimage on ${{ matrix.config.name }}
332331
runs-on: ubuntu-22.04
333332
strategy:
@@ -413,33 +412,35 @@ jobs:
413412
- name: Packaging appimage
414413
run: |
415414
set -x
416-
APPIMAGE_DST_PATH="$GITHUB_WORKSPACE/${PRODUCT}.AppDir"
417-
mkdir -p "${APPIMAGE_DST_PATH}"
415+
APPIMAGE_DST_PATH=$GITHUB_WORKSPACE/${PRODUCT}.AppDir
416+
mkdir -p ${APPIMAGE_DST_PATH}
418417
419418
cd $GITHUB_WORKSPACE
420-
cmake -S . -B build -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX="/usr/${APPIMAGE_DST_PATH}" -DUSE_LAUNCHER_ABSOLUTE_PATH:BOOL=OFF
421-
cmake --build build --target install --config RelWithDebInfo -- -j$(nproc)
422-
423-
424-
$GITHUB_WORKSPACE/appimagetool -s deploy "${APPIMAGE_DST_PATH}/usr/share/applications/org.flameshot.Flameshot.desktop" "${APPIMAGE_DST_PATH}"
419+
cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr -DUSE_LAUNCHER_ABSOLUTE_PATH:BOOL=OFF
420+
make -j$(nproc) DESTDIR=${APPIMAGE_DST_PATH} install
425421
426-
mkdir -p "${APPIMAGE_DST_PATH}/usr/plugins/platforminputcontexts"
422+
$GITHUB_WORKSPACE/appimagetool -s deploy "${APPIMAGE_DST_PATH}/usr/share/applications/org.flameshot.Flameshot.desktop"
423+
424+
mkdir -p ${APPIMAGE_DST_PATH}/usr/plugins/platforminputcontexts
427425
cp \
428426
/usr/lib/x86_64-linux-gnu/qt5/plugins/platforminputcontexts/libfcitxplatforminputcontextplugin.so \
429-
"${APPIMAGE_DST_PATH}/usr/plugins/platforminputcontexts/"
427+
${APPIMAGE_DST_PATH}/usr/plugins/platforminputcontexts/
430428
431429
cp \
432430
$GITHUB_WORKSPACE/data/img/app/org.flameshot.Flameshot.png \
433-
"${APPIMAGE_DST_PATH}"/
431+
${APPIMAGE_DST_PATH}/
434432
435433
if [ -f "${APPIMAGE_DST_PATH}/lib/x86_64-linux-gnu/libxcb-glx.so.0" ]; then
436-
rm "${APPIMAGE_DST_PATH}/lib/x86_64-linux-gnu/libxcb-glx.so.0"
434+
rm ${APPIMAGE_DST_PATH}/lib/x86_64-linux-gnu/libxcb-glx.so.0
437435
fi
438436
439-
chmod +x "${APPIMAGE_DST_PATH}/usr/lib64/ld-*.so.*"
437+
chmod +x ${APPIMAGE_DST_PATH}/usr/lib64/ld-*.so.*
438+
440439
441440
VERSION=${VERSION} $GITHUB_WORKSPACE/appimagetool "${APPIMAGE_DST_PATH}"
442441
mv $GITHUB_WORKSPACE/Flameshot-${VERSION}-x86_64.AppImage $GITHUB_WORKSPACE/Flameshot-${VERSION}.x86_64.AppImage
442+
443+
443444
- name: SHA256Sum of appimage package(daily build)
444445
run: |
445446
cd "$GITHUB_WORKSPACE/" || { >&2 echo "Cannot cd to '$GITHUB_WORKSPACE/'!"; exit 11 ; }

0 commit comments

Comments
 (0)