CI: stop using the ci template

it's just slow
This commit is contained in:
Bilal Elmoussaoui 2020-12-05 22:17:17 +01:00
parent 90a5399a88
commit c8ad8936e3
3 changed files with 27 additions and 10 deletions

2
.gitignore vendored
View file

@ -10,3 +10,5 @@ src/static_resources.rs
*.*~ *.*~
builddir/ builddir/
.flatpak/ .flatpak/
.flatpak-builder/
app/

View file

@ -1,6 +1,9 @@
include: variables:
- project: "gnome/citemplates" BUNDLE: "authenticator-nightly.flatpak"
file: "flatpak/flatpak_ci_initiative.yml" MANIFEST_PATH: "build-aux/com.belmoussaoui.Authenticator.Devel.json"
FLATPAK_MODULE: "authenticator"
APP_ID: "com.belmoussaoui.Authenticator.Devel"
RUNTIME_REPO: "https://nightly.gnome.org/gnome-nightly.flatpakrepo"
stages: stages:
- check - check
@ -10,13 +13,20 @@ stages:
flatpak: flatpak:
image: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/rust_bundle:master" image: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/rust_bundle:master"
stage: test stage: test
variables: script:
BUNDLE: "authenticator-nightly.flatpak" - >
MANIFEST_PATH: "build-aux/com.belmoussaoui.Authenticator.Devel.json" xvfb-run -a -s "-screen 0 1024x768x24"
FLATPAK_MODULE: "authenticator" flatpak-builder --keep-build-dirs --user --disable-rofiles-fuse flatpak_app --repo=repo ${BRANCH:+--default-branch=$BRANCH} ${MANIFEST_PATH}
APP_ID: "com.belmoussaoui.Authenticator.Devel" - flatpak build-bundle repo ${BUNDLE} --runtime-repo=${RUNTIME_REPO} ${APP_ID} ${BRANCH}
RUNTIME_REPO: "https://nightly.gnome.org/gnome-nightly.flatpakrepo" artifacts:
extends: ".flatpak" name: 'Flatpak artifacts'
expose_as: 'Get Flatpak bundle here'
when: 'always'
paths:
- "${BUNDLE}"
- '.flatpak-builder/build/${FLATPAK_MODULE}/_flatpak_build/meson-logs/meson-log.txt'
- '.flatpak-builder/build/${FLATPAK_MODULE}/_flatpak_build/meson-logs/testlog.txt'
expire_in: 14 days
rustfmt: rustfmt:
image: "rust:slim" image: "rust:slim"

View file

@ -17,6 +17,10 @@
"build-options": { "build-options": {
"append-path": "/usr/lib/sdk/rust-stable/bin", "append-path": "/usr/lib/sdk/rust-stable/bin",
"build-args": ["--share=network"], "build-args": ["--share=network"],
"test-args": [
"--socket=x11",
"--share=network"
],
"env": { "env": {
"CARGO_HOME": "/run/build/authenticator/cargo", "CARGO_HOME": "/run/build/authenticator/cargo",
"RUST_BACKTRACE": "1", "RUST_BACKTRACE": "1",
@ -74,6 +78,7 @@
{ {
"name": "authenticator", "name": "authenticator",
"buildsystem": "meson", "buildsystem": "meson",
"run-tests": true,
"config-opts": ["-Dprofile=development"], "config-opts": ["-Dprofile=development"],
"sources": [ "sources": [
{ {