mirror of
https://github.com/fergalmoran/flameshot.git
synced 2025-12-22 09:51:06 +00:00
fix(cicd): get status of the Experimental option for docker (#3312)
* fix(cicd): get status of the Experimental option for docker * fix(cicd-snap): update kde-frameworks-5-99-qt-5-15-7-core20 * fix(cicd-appimage): disable until it is fixed * fix(cicd-appimage): disable until it is fixed * fix(cicd-appimage): disable until it is fixed * Revert "fix(cicd-appimage): disable until it is fixed" This reverts commit 71cf5bae787795a14243ca184102afbe4144513b. * Revert "fix(cicd-appimage): disable until it is fixed" This reverts commit 4397b4f30fa9dee948a2cebd0d14f968bd80b26c. * Partially revert 'eb89ab7a': Remove APPIMAGE_PACK_ENABLE variable --------- Co-authored-by: Yurii Puchkov <yurii@gocariq.com>
This commit is contained in:
25
.github/workflows/Linux-pack.yml
vendored
25
.github/workflows/Linux-pack.yml
vendored
@@ -88,8 +88,7 @@ jobs:
|
|||||||
mkdir -p ~/.docker
|
mkdir -p ~/.docker
|
||||||
echo $'{\n "experimental": "enabled"\n}' | sudo tee ~/.docker/config.json
|
echo $'{\n "experimental": "enabled"\n}' | sudo tee ~/.docker/config.json
|
||||||
sudo service docker restart
|
sudo service docker restart
|
||||||
docker version -f '{{.Client.Experimental}}'
|
docker version -f "{{ (index .Server.Components 0).Details.Experimental }}"
|
||||||
docker version -f '{{.Server.Experimental}}'
|
|
||||||
docker buildx version
|
docker buildx version
|
||||||
- name: Support for ARM via QEMU's user-mode emulation
|
- name: Support for ARM via QEMU's user-mode emulation
|
||||||
# Register binfmt_misc entry for qemu-user-static
|
# Register binfmt_misc entry for qemu-user-static
|
||||||
@@ -401,7 +400,6 @@ jobs:
|
|||||||
ca-certificates \
|
ca-certificates \
|
||||||
jq
|
jq
|
||||||
|
|
||||||
|
|
||||||
- name: Get go-appimage tool
|
- name: Get go-appimage tool
|
||||||
# Will not use linuxdeployqt anymore, because it suopprts currently still-supported mainstream distribution,
|
# Will not use linuxdeployqt anymore, because it suopprts currently still-supported mainstream distribution,
|
||||||
# which is glibc 2.23. For more information, please see https://github.com/probonopd/linuxdeployqt/issues/340.
|
# which is glibc 2.23. For more information, please see https://github.com/probonopd/linuxdeployqt/issues/340.
|
||||||
@@ -414,32 +412,33 @@ jobs:
|
|||||||
APPIMAGETOOL_ARCH: x86_64
|
APPIMAGETOOL_ARCH: x86_64
|
||||||
- name: Packaging appimage
|
- name: Packaging appimage
|
||||||
run: |
|
run: |
|
||||||
APPIMAGE_DST_PATH=$GITHUB_WORKSPACE/${PRODUCT}.AppDir
|
set -x
|
||||||
mkdir -p ${APPIMAGE_DST_PATH}
|
APPIMAGE_DST_PATH="$GITHUB_WORKSPACE/${PRODUCT}.AppDir"
|
||||||
|
mkdir -p "${APPIMAGE_DST_PATH}"
|
||||||
|
|
||||||
cd $GITHUB_WORKSPACE
|
cd $GITHUB_WORKSPACE
|
||||||
cmake -S -B build -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr/"${APPIMAGE_DST_PATH}" -DUSE_LAUNCHER_ABSOLUTE_PATH:BOOL=OFF
|
cmake -S . -B build -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX="/usr/${APPIMAGE_DST_PATH}" -DUSE_LAUNCHER_ABSOLUTE_PATH:BOOL=OFF
|
||||||
cmake --build build --target install --config RelWithDebInfo -- -j$(nproc)
|
cmake --build build --target install --config RelWithDebInfo -- -j$(nproc)
|
||||||
|
|
||||||
|
|
||||||
$GITHUB_WORKSPACE/appimagetool -s deploy ${APPIMAGE_DST_PATH}/usr/share/applications/org.flameshot.Flameshot.desktop
|
$GITHUB_WORKSPACE/appimagetool -s deploy "${APPIMAGE_DST_PATH}/usr/share/applications/org.flameshot.Flameshot.desktop" "${APPIMAGE_DST_PATH}"
|
||||||
|
|
||||||
mkdir -p ${APPIMAGE_DST_PATH}/usr/plugins/platforminputcontexts
|
mkdir -p "${APPIMAGE_DST_PATH}/usr/plugins/platforminputcontexts"
|
||||||
cp \
|
cp \
|
||||||
/usr/lib/x86_64-linux-gnu/qt5/plugins/platforminputcontexts/libfcitxplatforminputcontextplugin.so \
|
/usr/lib/x86_64-linux-gnu/qt5/plugins/platforminputcontexts/libfcitxplatforminputcontextplugin.so \
|
||||||
${APPIMAGE_DST_PATH}/usr/plugins/platforminputcontexts/
|
"${APPIMAGE_DST_PATH}/usr/plugins/platforminputcontexts/"
|
||||||
|
|
||||||
cp \
|
cp \
|
||||||
$GITHUB_WORKSPACE/data/img/app/org.flameshot.Flameshot.png \
|
$GITHUB_WORKSPACE/data/img/app/org.flameshot.Flameshot.png \
|
||||||
${APPIMAGE_DST_PATH}/
|
"${APPIMAGE_DST_PATH}"/
|
||||||
|
|
||||||
if [ -f "${APPIMAGE_DST_PATH}/lib/x86_64-linux-gnu/libxcb-glx.so.0" ]; then
|
if [ -f "${APPIMAGE_DST_PATH}/lib/x86_64-linux-gnu/libxcb-glx.so.0" ]; then
|
||||||
rm ${APPIMAGE_DST_PATH}/lib/x86_64-linux-gnu/libxcb-glx.so.0
|
rm "${APPIMAGE_DST_PATH}/lib/x86_64-linux-gnu/libxcb-glx.so.0"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
chmod +x ${APPIMAGE_DST_PATH}/usr/lib64/ld-*.so.*
|
chmod +x "${APPIMAGE_DST_PATH}/usr/lib64/ld-*.so.*"
|
||||||
|
|
||||||
VERSION=${VERSION} $GITHUB_WORKSPACE/appimagetool ${APPIMAGE_DST_PATH}
|
VERSION=${VERSION} $GITHUB_WORKSPACE/appimagetool "${APPIMAGE_DST_PATH}"
|
||||||
mv $GITHUB_WORKSPACE/Flameshot-${VERSION}-x86_64.AppImage $GITHUB_WORKSPACE/Flameshot-${VERSION}.x86_64.AppImage
|
mv $GITHUB_WORKSPACE/Flameshot-${VERSION}-x86_64.AppImage $GITHUB_WORKSPACE/Flameshot-${VERSION}.x86_64.AppImage
|
||||||
- name: SHA256Sum of appimage package(daily build)
|
- name: SHA256Sum of appimage package(daily build)
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ apps:
|
|||||||
parts:
|
parts:
|
||||||
flameshot:
|
flameshot:
|
||||||
build-snaps:
|
build-snaps:
|
||||||
- kde-frameworks-5-qt-5-15-core20
|
- kde-frameworks-5-99-qt-5-15-7-core20
|
||||||
source: https://github.com/flameshot-org/flameshot.git
|
source: https://github.com/flameshot-org/flameshot.git
|
||||||
plugin: cmake
|
plugin: cmake
|
||||||
cmake-parameters:
|
cmake-parameters:
|
||||||
|
|||||||
Reference in New Issue
Block a user