summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Soriano <csoriano1618@gmail.com>2018-03-16 21:01:33 +0000
committerCarlos Soriano <csoriano1618@gmail.com>2018-03-16 21:01:33 +0000
commita6ac49465b07995c8e993738331c3b3ce90379d8 (patch)
tree895a4707cf154f5af4f688e8a7c9618f41915cab
parent4f4c1a3c97b861b0414ba43b13fa43ccbc239b45 (diff)
downloadnautilus-a6ac49465b07995c8e993738331c3b3ce90379d8.tar.gz
CI: Revert to have test pipeline a full build
ninja test regenerates a full build anyway...
-rw-r--r--.gitlab-ci.yml21
1 files changed, 10 insertions, 11 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c976ce14d..11edb797a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,6 @@ stages:
- build
- test
- weeklytest
-- deploy
build:fedora:
image: fedora:28
@@ -12,25 +11,25 @@ build:fedora:
gtk3-devel gnome-autoar-devel gnome-desktop3-devel
gobject-introspection-devel libselinux-devel
libxml2-devel tracker-devel desktop-file-utils
- libgexiv2-devel gcovr
- # Waiting for gcovr 3.5 to be released.
- - pip install git+https://github.com/gcovr/gcovr.git
- - meson _build . -Db_coverage=true
- artifacts:
- paths:
- - _build
+ libgexiv2-devel
+ - meson _build .
test:fedora:
image: fedora:28
stage: test
- dependencies:
- - build:fedora
script:
- - dnf install -y gcc meson git
+ - dnf install -y gcc meson gettext itstool redhat-rpm-config git
+ gtk3-devel gnome-autoar-devel gnome-desktop3-devel
+ gobject-introspection-devel libselinux-devel
+ libxml2-devel tracker-devel desktop-file-utils
+ libgexiv2-devel gcovr
# Coverage data contains paths relative to the build directory,
# so changing to it makes writing filter expressions easier.
#
# _build/src/ contains generated sources, so that is filtered out as well.
+ # Waiting for gcovr 3.5 to be released.
+ - pip install git+https://github.com/gcovr/gcovr.git
+ - meson _build . -Db_coverage=true
- cd _build
- ninja test
- gcovr --root=.