GitLab/fluffychat
2
0
Fork 0
mirror of https://gitlab.com/famedly/fluffychat.git synced 2025-02-21 08:40:40 +01:00
Code Issues Projects Releases Wiki Activity

feat: include jsoncpp into appimages

Browse Source 
- almost all portability issues of FluffyChat are caused by JSON CPP
- including it hence
- problem caused on Arch, Gentoo, Manjaro and Ubuntu Xenial

Signed-off-by: TheOneWithTheBraid <the-one@with-the-braid.cf>
This commit is contained in:
TheOneWithTheBraid 2022-06-08 09:46:21 +02:00
parent 643b5c84eb
commit 2edf5ba517
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
.gitlab-ci.yml
View File

@ -197,7 +197,9 @@ build_linux_x86:
[ [
sudo apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install keyboard-configuration -y && sudo apt-get install curl clang cmake ninja-build pkg-config libgtk-3-dev libblkid-dev liblzma-dev libjsoncpp-dev cmake-data libjsoncpp1 libsecret-1-dev libsecret-1-0 librhash0 -y, sudo apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install keyboard-configuration -y && sudo apt-get install curl clang cmake ninja-build pkg-config libgtk-3-dev libblkid-dev liblzma-dev libjsoncpp-dev cmake-data libjsoncpp1 libsecret-1-dev libsecret-1-0 librhash0 -y,
] ]
script: [./scripts/build-linux.sh] script:
- ./scripts/build-linux.sh
- cp /usr/lib/x86_64-linux-gnu/libjsoncpp.so.1 build/linux/x64/release/bundle/lib/
artifacts: artifacts:
when: on_success when: on_success
paths: paths:
@ -206,7 +208,9 @@ build_linux_x86:
build_linux_arm64: build_linux_arm64:
stage: coverage stage: coverage
before_script: [flutter upgrade] before_script: [flutter upgrade]
script: [./scripts/build-linux.sh] script:
- ./scripts/build-linux.sh
- cp /usr/lib/aarch64-linux-gnu/libjsoncpp.so.1 build/linux/arm64/release/bundle/lib/
tags: [docker_arm64] tags: [docker_arm64]
only: only:
- main - main
@ -221,15 +225,18 @@ build_linux_appimage_x86:
stage: deploy stage: deploy
image: appimagecrafters/appimage-builder image: appimagecrafters/appimage-builder
needs: [build_linux_x86] needs: [build_linux_x86]
only: #only:
- main #- main
- tags #- tags
script: script:
- cp -r build/linux/x64/release/bundle appimage/FluffyChat.AppDir - cp -r build/linux/x64/release/bundle appimage/FluffyChat.AppDir
- cd appimage - cd appimage
- cp FluffyChat.desktop FluffyChat.AppDir/ - cp FluffyChat.desktop FluffyChat.AppDir/
- cp AppRun FluffyChat.AppDir/ - cp AppRun FluffyChat.AppDir/
- cp ../assets/logo.svg FluffyChat.AppDir/fluffychat.svg - cp ../assets/logo.svg FluffyChat.AppDir/fluffychat.svg
# libjsoncpp if often breaking portability, including it hence
- mkdir -p FluffyChat.AppDir/lib/x86_64-linux-gnu/
- cp FluffyChat.AppDir/lib/libjsoncpp.so.1 FluffyChat.AppDir/lib/x86_64-linux-gnu/libjsoncpp.so.1
- appimagetool -u "zsync|https://gitlab.com/famedly/fluffychat/-/releases/permalink/latest/downloads/FluffyChat-x86_64.AppImage.zsync" FluffyChat.AppDir - appimagetool -u "zsync|https://gitlab.com/famedly/fluffychat/-/releases/permalink/latest/downloads/FluffyChat-x86_64.AppImage.zsync" FluffyChat.AppDir
allow_failure: true allow_failure: true
artifacts: artifacts:
@ -252,6 +259,9 @@ build_linux_appimage_arm64:
- cp FluffyChat.desktop FluffyChat.AppDir/ - cp FluffyChat.desktop FluffyChat.AppDir/
- cp AppRun FluffyChat.AppDir/ - cp AppRun FluffyChat.AppDir/
- cp ../assets/logo.svg FluffyChat.AppDir/fluffychat.svg - cp ../assets/logo.svg FluffyChat.AppDir/fluffychat.svg
# libjsoncpp if often breaking portability, including it hence
- mkdir -p FluffyChat.AppDir/lib/aarch64-linux-gnu/
- cp FluffyChat.AppDir/lib/libjsoncpp.so.1 FluffyChat.AppDir/lib/aarch64-linux-gnu/libjsoncpp.so.1
- appimagetool -u "zsync|https://gitlab.com/famedly/fluffychat/-/releases/permalink/latest/downloads/FluffyChat-arm64.AppImage.zsync" FluffyChat.AppDir - appimagetool -u "zsync|https://gitlab.com/famedly/fluffychat/-/releases/permalink/latest/downloads/FluffyChat-arm64.AppImage.zsync" FluffyChat.AppDir
allow_failure: true allow_failure: true
artifacts: artifacts: