From f61fdc5a55b3ce6280324d11dc9dafa29c5a08fe Mon Sep 17 00:00:00 2001 From: Sebastian Lobinger <sebastian.lobinger@fu-berlin.de> Date: Thu, 15 Jun 2017 08:34:07 +0200 Subject: [PATCH] combination of only and except tp run jobs for master or others fix #25 --- .gitlab-ci.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 16c8f85..6d4883f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,6 +17,8 @@ test-others: - git config --global user.email ${GITLAB_USER_EMAIL} - git config --global user.name ${GITLAB_USER_ID} - git merge origin/master --no-commit --no-ff + only: + - branches except: - master @@ -31,10 +33,12 @@ build-master: artifacts: paths: - build/* - - ENVIRONMENTS + - ./ENVIRONMENTS expire_in: 1 hrs only: - master + except: + - branches environment: name: staging @@ -53,6 +57,8 @@ test-and-deploy-master: only: - tags - master + exceot: + - branches artifacts: paths: - build/* -- GitLab