summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml10
1 files changed, 5 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d62c84634..9dbb56c28 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,7 +16,7 @@ stages:
- test
check-code-style:
- image: registry.gitlab.gnome.org/gnome/epiphany/master:v2
+ image: registry.gitlab.gnome.org/gnome/epiphany/master:v4
interruptible: true
script:
- bash data/check-code-style
@@ -41,13 +41,13 @@ flatpak master:
- master
scanbuild:
- image: registry.gitlab.gnome.org/gnome/epiphany/master:v2
+ extends: '.flatpak'
variables:
CONFIG_OPTS: '-Dprofile=Devel -Dunit_tests=enabled --werror'
script:
- - mkdir _build
- - meson ${CONFIG_OPTS} _build
- - ninja -C _build scan-build
+ - flatpak-builder --user --disable-rofiles-fuse --stop-at=${FLATPAK_MODULE} flatpak_app ${MANIFEST_PATH}
+ - 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:
when: on_failure