Merge branch 'feat/appimage-pipeline' into 'main'

feat: rework gitlab ci around arch; add appimage build

See merge request gabmus/rex2!1
This commit is contained in:
GabMus 2023-07-07 19:46:31 +00:00
commit 009516a7d7
3 changed files with 22 additions and 13 deletions

View file

@ -1,14 +1,26 @@
image: "rust:alpine"
image: "archlinux:base-devel"
test:cargo:
stages:
- test
- deploy
cargo:test:
stage: test
script:
- apk add gtk4.0-dev libadwaita-dev musl-dev openssl-dev desktop-file-utils meson git
- pacman -Syu gtk4 libadwaita gtksourceview5 openssl desktop-file-utils meson ninja git rust bash fuse2 --needed --noconfirm
- rustc --version && cargo --version # Print version info for debugging
- meson setup build -Dprefix="$PWD/build/localprefix" -Dprofile=development
- ninja -C build
- cargo test --workspace --verbose
cache:
paths:
- /var/cache/pacman
# deploy:
# stage: deploy
# script: echo "Define your deployment script!"
# environment: production
appimage:
stage: deploy
script:
- pacman -Syu gtk4 libadwaita gtksourceview5 openssl desktop-file-utils meson ninja git rust bash fuse2 --needed --noconfirm
- bash ./dist/appimage/build_appimage.sh
artifacts:
paths:
- Rex2-*.AppImage

View file

@ -10,9 +10,11 @@ fi
meson setup appimage_build -Dprefix=/usr -Dprofile=development
DESTDIR="$PWD/AppDir" ninja -C appimage_build install
curl -SsLO https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
chmod +x linuxdeploy-x86_64.AppImage
cp dist/appimage/linuxdeploy-plugin-gtk.sh ./
./linuxdeploy-x86_64.AppImage \
--appimage-extract-and-run \
--appdir AppDir \
--plugin gtk \
--output appimage \

View file

@ -19,12 +19,7 @@
"path": null,
"repo": null
},
"mercury": {
"feature_type": "Mercury",
"enabled": false,
"path": null,
"repo": null
}
"mercury_enabled": false
},
"environment": {
"XRT_COMPOSITOR_SCALE_PERCENTAGE": "140",