From 712c0c38395381624c56ece8f9311db516193dd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@sury.org>
Date: Thu, 19 Jan 2017 21:42:43 +0100
Subject: [PATCH 1/2] Use docs-* as a documentation build branch
---
.gitlab-ci.yml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 14451e2e10..b6528a3145 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -50,6 +50,7 @@ configure:ubuntu:amd64:
<<: *configure_job
except:
- tags
+ - docs-*
build:ubuntu:amd64:
<<: *ubuntu_xenial
@@ -58,6 +59,7 @@ build:ubuntu:amd64:
- configure:ubuntu:amd64
except:
- tags
+ - docs-*
test:ubuntu:amd64:
<<: *ubuntu_xenial
@@ -66,6 +68,7 @@ test:ubuntu:amd64:
- build:ubuntu:amd64
except:
- tags
+ - docs-*
configure:debian:stretch:amd64:
<<: *debian_stretch
@@ -91,6 +94,7 @@ build:documentation:
only:
- tags
- triggers
+ - docs-*
script:
- make -C doc html singlehtml pdf
artifacts:
@@ -108,6 +112,7 @@ deploy:documentation:
only:
- tags
- triggers
+ - docs-*
script:
- "curl --http1.1 --request POST --form token=$WEBSITE_TOKEN --form ref=master --form \"variables[RELEASE_CI_BUILD_REF_NAME]=$CI_BUILD_REF_NAME\" --form \"variables[RELEASE_CI_BUILD_ID]=$CI_BUILD_ID\" https://gitlab.labs.nic.cz/api/v3/projects/5/trigger/builds"
artifacts:
--
GitLab
From 0a53905e6559e3b3da0ee2d97f7526c84fc6a66f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@sury.org>
Date: Fri, 20 Jan 2017 15:00:48 +0100
Subject: [PATCH 2/2] Try armel build
---
.gitlab-ci.yml | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b6528a3145..e4e11119bb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,6 +23,13 @@ stages:
- linux
- amd64
+.debian_stretch_armel: &debian_stretch_armel
+ image: cznic/armel-debian-knot
+ tags:
+ - docker
+ - linux
+ - arm
+
.configure: &configure_job
stage: configure
script:
@@ -86,6 +93,22 @@ test:debian:stretch:amd64:
dependencies:
- build:debian:stretch:amd64
+configure:debian:stretch:armel:
+ <<: *debian_stretch_armel
+ <<: *configure_job
+
+build:debian:stretch:armel:
+ <<: *debian_stretch_armel
+ <<: *build_job
+ dependencies:
+ - configure:debian:stretch:armel
+
+test:debian:stretch:armel:
+ <<: *debian_stretch_armel
+ <<: *test_job
+ dependencies:
+ - build:debian:stretch:armel
+
build:documentation:
<<: *debian_stretch
stage: build
--
GitLab