[gnome-shell/wip/fmuellner/ci-test] ci: Use custom image
- From: Florian Müllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell/wip/fmuellner/ci-test] ci: Use custom image
- Date: Wed, 13 Feb 2019 00:51:00 +0000 (UTC)
commit 80cc15cc8cdaafaf988147b2ac5be1e02412803d
Author: Florian Müllner <fmuellner gnome org>
Date: Wed Feb 13 01:50:21 2019 +0100
ci: Use custom image
.gitlab-ci.yml | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 226c26059..e1aa430b2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,8 @@ variables:
POT_LOG: "pot-update.txt"
js_check:
- image: registry.fedoraproject.org/fedora:latest
+ #image: registry.fedoraproject.org/fedora:latest
+ image: registry.gitlab.gnome.org/gnome/gnome-shell:latest
stage: source_check
before_script:
- dnf install -y findutils mozjs60-devel
@@ -24,12 +25,9 @@ js_check:
when: on_failure
build:
- image: registry.gitlab.gnome.org/gnome/mutter/master:v1
+ image: registry.gitlab.gnome.org/gnome/gnome-shell:latest
stage: build
before_script:
- # non-mutter build dependencies
- - dnf builddep -y gnome-shell
- - dnf remove -y mutter
# check out mutter ...
- git clone https://gitlab.gnome.org/GNOME/mutter.git
- cd mutter
@@ -53,14 +51,11 @@ build:
- build
test:
- image: registry.gitlab.gnome.org/gnome/mutter/master:v1
+ image: registry.gitlab.gnome.org/gnome/gnome-shell:latest
stage: test
dependencies:
- build
before_script:
- - dnf builddep -y gnome-shell
- - dnf remove -y mutter
- - dnf install -y '*/xvfb-run' '*/Gdm-1.0.typelib'
- ninja -C mutter/build install
script:
- xvfb-run meson test -C build --no-rebuild
@@ -71,14 +66,13 @@ test:
when: on_failure
test-pot:
- image: registry.gitlab.gnome.org/gnome/mutter/master:v1
+ image: registry.gitlab.gnome.org/gnome/gnome-shell:latest
stage: test
dependencies:
- build
script:
# Check that pot files are generated correctly:
# https://savannah.gnu.org/bugs/?50920#comment5
- - ninja -C build -v gnome-shell-pot
- ninja -C build gnome-shell-pot 2>&1 | awk '
BEGIN { start=0; }
start==1 { print $0; }
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]