ci: Avoid multiple builds and opt for tests
Part-of: <https://gitlab.gnome.org/Incubator/loupe/-/merge_requests/188>
This commit is contained in:
parent
997cab9d8d
commit
e3612c2967
1 changed files with 35 additions and 4 deletions
|
|
@ -7,18 +7,27 @@ variables:
|
||||||
MANIFEST_PATH: "build-aux/flatpak/org.gnome.Loupe.Devel.json"
|
MANIFEST_PATH: "build-aux/flatpak/org.gnome.Loupe.Devel.json"
|
||||||
FLATPAK_MODULE: "loupe"
|
FLATPAK_MODULE: "loupe"
|
||||||
APP_ID: "org.gnome.Loupe.Devel"
|
APP_ID: "org.gnome.Loupe.Devel"
|
||||||
CONFIG_OPTS: "-Dprofile=ci"
|
|
||||||
RUNTIME_REPO: "https://nightly.gnome.org/gnome-nightly.flatpakrepo"
|
RUNTIME_REPO: "https://nightly.gnome.org/gnome-nightly.flatpakrepo"
|
||||||
|
|
||||||
flatpak:
|
flatpak:
|
||||||
extends: ".flatpak@x86_64"
|
extends: ".flatpak@x86_64"
|
||||||
|
interruptible: true
|
||||||
|
variables:
|
||||||
|
# We are running tests manually
|
||||||
|
RUN_TESTS: "0"
|
||||||
|
CONFIG_OPTS: "-Dprofile=ci"
|
||||||
|
|
||||||
flatpak@aarch64:
|
flatpak@aarch64:
|
||||||
allow_failure: true
|
|
||||||
extends: ".flatpak@aarch64"
|
extends: ".flatpak@aarch64"
|
||||||
|
allow_failure: true
|
||||||
|
interruptible: true
|
||||||
|
variables:
|
||||||
|
RUN_TESTS: "0"
|
||||||
|
CONFIG_OPTS: "-Dprofile=ci"
|
||||||
|
|
||||||
cargo-fmt:
|
cargo-fmt:
|
||||||
image: "rust:slim"
|
image: "rust:slim"
|
||||||
|
interruptible: true
|
||||||
script:
|
script:
|
||||||
- rustup component add rustfmt
|
- rustup component add rustfmt
|
||||||
# Create blank versions of our configured files
|
# Create blank versions of our configured files
|
||||||
|
|
@ -46,7 +55,7 @@ cargo-doc:
|
||||||
- date && date -u
|
- date && date -u
|
||||||
|
|
||||||
- rewrite-flatpak-manifest ${MANIFEST_PATH} ${FLATPAK_MODULE} ${CONFIG_OPTS}
|
- rewrite-flatpak-manifest ${MANIFEST_PATH} ${FLATPAK_MODULE} ${CONFIG_OPTS}
|
||||||
- flatpak-builder --user --disable-rofiles-fuse --build-only flatpak_app ${MANIFEST_PATH}
|
- flatpak-builder --user --disable-rofiles-fuse --force-clean --keep-build-dirs --stop-at=${FLATPAK_MODULE} flatpak_app ${MANIFEST_PATH}
|
||||||
- flatpak build-finish --socket=x11 --share=network flatpak_app
|
- flatpak build-finish --socket=x11 --share=network flatpak_app
|
||||||
- >
|
- >
|
||||||
xvfb-run -a -s "-screen 0 1024x768x24"
|
xvfb-run -a -s "-screen 0 1024x768x24"
|
||||||
|
|
@ -70,7 +79,7 @@ cargo-clippy:
|
||||||
- date && date -u
|
- date && date -u
|
||||||
|
|
||||||
- rewrite-flatpak-manifest ${MANIFEST_PATH} ${FLATPAK_MODULE} ${CONFIG_OPTS}
|
- rewrite-flatpak-manifest ${MANIFEST_PATH} ${FLATPAK_MODULE} ${CONFIG_OPTS}
|
||||||
- flatpak-builder --user --disable-rofiles-fuse --build-only flatpak_app ${MANIFEST_PATH}
|
- flatpak-builder --user --disable-rofiles-fuse --force-clean --keep-build-dirs --stop-at=${FLATPAK_MODULE} flatpak_app ${MANIFEST_PATH}
|
||||||
- flatpak build-finish --socket=x11 --share=network flatpak_app
|
- flatpak build-finish --socket=x11 --share=network flatpak_app
|
||||||
- >
|
- >
|
||||||
xvfb-run -a -s "-screen 0 1024x768x24"
|
xvfb-run -a -s "-screen 0 1024x768x24"
|
||||||
|
|
@ -78,6 +87,28 @@ cargo-clippy:
|
||||||
cargo clippy -- -D warnings
|
cargo clippy -- -D warnings
|
||||||
END
|
END
|
||||||
|
|
||||||
|
cargo-test:
|
||||||
|
image: 'quay.io/gnome_infrastructure/gnome-runtime-images:gnome-master'
|
||||||
|
interruptible: true
|
||||||
|
tags:
|
||||||
|
- flatpak
|
||||||
|
script:
|
||||||
|
# Report the installed versions of the runtime
|
||||||
|
- flatpak info org.gnome.Platform
|
||||||
|
- flatpak info org.gnome.Sdk
|
||||||
|
|
||||||
|
# Print the date, since appstream depends on local timezone
|
||||||
|
- date && date -u
|
||||||
|
|
||||||
|
- rewrite-flatpak-manifest ${MANIFEST_PATH} ${FLATPAK_MODULE} ${CONFIG_OPTS}
|
||||||
|
- flatpak-builder --user --disable-rofiles-fuse --force-clean --keep-build-dirs --stop-at=${FLATPAK_MODULE} flatpak_app ${MANIFEST_PATH}
|
||||||
|
- flatpak build-finish --socket=x11 --share=network flatpak_app
|
||||||
|
- >
|
||||||
|
xvfb-run -a -s "-screen 0 1024x768x24"
|
||||||
|
flatpak-builder --user --disable-rofiles-fuse --build-shell=${FLATPAK_MODULE} flatpak_app ${MANIFEST_PATH} <<END
|
||||||
|
cargo test
|
||||||
|
END
|
||||||
|
|
||||||
cargo-audit:
|
cargo-audit:
|
||||||
interruptible: true
|
interruptible: true
|
||||||
image: rust
|
image: rust
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue