[epiphany] Update to latest CI template

[Michael Catanzaro <mcatanzaro src gnome org>]

commit a76fbb7b6648430ef45fb869693debcfe5343232
Author: Jan-Michael Brummer <jan brummer tabos org>
Date:   Thu May 7 11:13:27 2020 +0200

    Update to latest CI template

 .gitlab-ci.yml | 53 ++++++++++++++++++++---------------------------------
 1 file changed, 20 insertions(+), 33 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 25013cacd..c83d7b23a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,58 +1,45 @@
-include:
-  - project: 'gnome/citemplates'
-    ref: 3ecafcc4f06d98a13eb958e86ae0d8c6f388c1aa
-    file: '/flatpak/flatpak_ci_initiative.yml'
+include: 'https://gitlab.gnome.org/GNOME/citemplates/raw/master/flatpak/flatpak_ci_initiative.yml'
+
+variables:
+  BUNDLE: 'epiphany-git.flatpak'
+  MANIFEST_PATH: 'org.gnome.Epiphany.json'
+  RUNTIME_REPO: 'https://nightly.gnome.org/gnome-nightly.flatpakrepo'
+  FLATPAK_MODULE: 'epiphany'
+  APP_ID: 'org.gnome.Epiphany.Devel'
 
 stages:
-  - build
+  - test
 
 check-code-style:
   stage: .pre
   image: alpine:latest
+  interruptible: true
   before_script:
     - apk update && apk add uncrustify bash python3
   script:
     - bash data/check-code-style
 
-variables:
-  BUNDLE: 'epiphany-git.flatpak'
-
-.flatpak-template:
-  extends: '.flatpak'
-  stage: build
-  variables:
-    MANIFEST_PATH: 'org.gnome.Epiphany.json'
-    RUNTIME_REPO: 'https://nightly.gnome.org/gnome-nightly.flatpakrepo'
-    FLATPAK_MODULE: 'epiphany'
-    APP_ID: 'org.gnome.Epiphany.Devel'
-
 flatpak:
-  extends: '.flatpak-template'
-  stage: build
+  extends: '.flatpak'
   variables:
-    MESON_ARGS: '-Dprofile=Devel -Dunit_tests=enabled --werror'
+    CONFIG_OPTS: '-Dprofile=Devel -Dunit_tests=enabled --werror'
   except:
     - master
 
-flatpak-master:
-  extends: '.flatpak-template'
-  stage: build
+flatpak master:
+  extends: '.flatpak'
   variables:
-    MESON_ARGS: '-Dtech_preview=true -Dprofile=Devel'
+    CONFIG_OPTS: '-Dtech_preview=true -Dprofile=Devel'
   only:
     - master
 
-flatpak-scanbuild:
-  extends: '.flatpak-template'
-  stage: .pre
-  tags:
-    - flatpak
+flatpak scanbuild:
+  extends: '.flatpak'
   variables:
-    MESON_ARGS: '-Dprofile=Devel -Dunit_tests=enabled --werror'
-  image: 'registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master'
+    CONFIG_OPTS: '-Dprofile=Devel -Dunit_tests=enabled --werror'
   script:
     - flatpak-builder --user --disable-rofiles-fuse --stop-at=${FLATPAK_MODULE} flatpak_app ${MANIFEST_PATH}
-    - flatpak build flatpak_app meson --prefix=/app ${MESON_ARGS} _build
+    - flatpak build flatpak_app meson --prefix=/app ${CONFIG_OPTS} _build
     - flatpak build flatpak_app ninja -C _build scan-build
     - bash -c 'if [[ -n "$(ls -A _build/meson-logs/scanbuild/)" ]]; then echo "Scan build log found, 
assuming defects exist"; exit 1; fi'
   artifacts:
@@ -63,4 +50,4 @@ flatpak-scanbuild:
 nightly:
   extends: '.publish_nightly'
   stage: .post
-  dependencies: ['flatpak-master']
+  dependencies: ['flatpak master']