summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorJulian Andres Klode <julian.klode@canonical.com>2018-06-25 13:12:13 +0200
committerJulian Andres Klode <julian.klode@canonical.com>2018-06-25 13:12:13 +0200
commit015bc510eb3a5fef0d1c53a339a2cbf89cc8211a (patch)
tree9a6e495fed444f87adab186bc08ea5f0d804cecd /.gitlab-ci.yml
parent43782f8bba846e664058130157e426ef54b638ea (diff)
gitlab-ci.yml: Also pull in ninja-build for 1.6.y
We don't use ninja to build the package in 1.6.y, so we need to pull it in manually.
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 18b44e9ac..252cd5dec 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,7 @@ test as root:
- adduser --home /home/travis travis --quiet --disabled-login --gecos "" --uid 1000
- rm -f /etc/dpkg/dpkg.cfg.d/excludes
- apt-get update
- - apt-get install -qq build-essential expect gcovr sudo
+ - apt-get install -qq build-essential expect gcovr sudo ninja-build
- chmod -R o+rwX $PWD
- ./prepare-release travis-ci
- sudo -u travis mkdir build
@@ -24,7 +24,7 @@ test as user:
- adduser --home /home/travis travis --quiet --disabled-login --gecos "" --uid 1000
- rm -f /etc/dpkg/dpkg.cfg.d/excludes
- apt-get update
- - apt-get install -qq build-essential expect gcovr sudo
+ - apt-get install -qq build-essential expect gcovr sudo ninja-build
- chmod -R o+rwX $PWD
- ./prepare-release travis-ci
- sudo -u travis mkdir build