ci: Simplify CI

Only build with the 'flatpak' stage, since it does
everything we do on other stages already.
This commit is contained in:
Georges Basile Stavracas Neto
2019-05-04 22:45:14 -03:00
parent a88b628507
commit 1f0179c431
+4 -74
View File
@@ -1,83 +1,13 @@
stages: stages:
- flatpak - flatpak
- build
- test
- deploy - deploy
- review - review
variables: variables:
DEPENDENCIES: gcc meson ninja-build gettext gtk-doc glib2-devel
gtk3-devel gsettings-desktop-schemas-devel git
gnome-online-accounts-devel libdazzle-devel
evolution-data-server-devel libgweather-devel
geoclue2-devel
# File name of the resulting Flatpak bundle # File name of the resulting Flatpak bundle
BUNDLE: "gnome-calendar-git.flatpak" BUNDLE: "gnome-calendar-git.flatpak"
##
# Stage: Build
#
# Checks if GNOME Calendar is properly building and installing. This is the
# most important stage of the CI, and no MR should ever be merged if it breaks
# any of them.
##
build:
image: fedora:rawhide
stage: build
before_script:
- dnf update -y --nogpgcheck && dnf install -y --nogpgcheck $DEPENDENCIES
script:
- meson . _build
- ninja -C _build
install:
image: fedora:rawhide
stage: build
before_script:
- dnf update -y --nogpgcheck && dnf install -y --nogpgcheck $DEPENDENCIES
script:
- meson . _build
- ninja -C _build
- ninja -C _build install
##
# Stage: Test
#
# Runs the unit tests and makes sure the new changes does not reintroduce bugs
# or breaks something unrelated.
##
test:
image: fedora:rawhide
stage: test
before_script:
- dnf update -y --nogpgcheck && dnf install -y --nogpgcheck $DEPENDENCIES
script:
- meson . _build
- ninja -C _build
- meson test -C _build --verbose --no-stdsplit
##
# Stage: Deploy
#
# Checks if the released version is perfectly functional.
##
deploy:
image: fedora:rawhide
stage: deploy
before_script:
- dnf update -y --nogpgcheck && dnf install -y --nogpgcheck $DEPENDENCIES
script:
- meson . _build
- ninja -C _build
- meson test -C _build
- ninja dist -C _build
only:
- tags
flatpak: flatpak:
image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master
stage: flatpak stage: flatpak
@@ -89,8 +19,8 @@ flatpak:
FLATPAK_MODULE: "gnome-calendar" FLATPAK_MODULE: "gnome-calendar"
# Make sure to keep this in sync with the Flatpak manifest, all arguments # Make sure to keep this in sync with the Flatpak manifest, all arguments
# are passed except the config-args because we build it ourselves # are passed except the config-args because we build it ourselves
MESON_ARGS: "-Dtracing=true -Ddocumentation=true" MESON_ARGS: "-Dtracing=true"
DBUS_ID: "org.gnome.Calendar" APP_ID: "org.gnome.Calendar"
script: script:
- flatpak-builder --stop-at=${FLATPAK_MODULE} app ${MANIFEST_PATH} - flatpak-builder --stop-at=${FLATPAK_MODULE} app ${MANIFEST_PATH}
@@ -100,7 +30,7 @@ flatpak:
- flatpak build app ninja -C _build install - flatpak build app ninja -C _build install
- flatpak-builder --finish-only --repo=repo app ${MANIFEST_PATH} - flatpak-builder --finish-only --repo=repo app ${MANIFEST_PATH}
# Generate a Flatpak bundle # Generate a Flatpak bundle
- flatpak build-bundle repo ${BUNDLE} --runtime-repo=${RUNTIME_REPO} ${DBUS_ID} - flatpak build-bundle repo ${BUNDLE} --runtime-repo=${RUNTIME_REPO} ${APP_ID}
# Run automatic tests inside the Flatpak env # Run automatic tests inside the Flatpak env
- xvfb-run -a -s "-screen 0 1024x768x24" flatpak build app ninja -C _build test - xvfb-run -a -s "-screen 0 1024x768x24" flatpak build app ninja -C _build test
artifacts: artifacts:
@@ -122,7 +52,7 @@ review:
artifacts: artifacts:
paths: paths:
- ${BUNDLE} - ${BUNDLE}
expire_in: 30 days expire_in: 20 days
environment: environment:
name: review/$CI_COMMIT_REF_NAME name: review/$CI_COMMIT_REF_NAME
url: https://gitlab.gnome.org/$CI_PROJECT_PATH/-/jobs/$CI_JOB_ID/artifacts/raw/${BUNDLE} url: https://gitlab.gnome.org/$CI_PROJECT_PATH/-/jobs/$CI_JOB_ID/artifacts/raw/${BUNDLE}