From a9307cc4e0cde41e2aa6055c85c514df8543c876 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Sat, 16 Sep 2017 17:28:06 +0200 Subject: [PATCH] deploy only on master and develop branches --- .gitlab-ci.yml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 28605dfc0..7e5bfe253 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -148,7 +148,7 @@ deploy:web: - build:packages - test:coverage only: - - develop + - master tags: - villas-deploy @@ -163,6 +163,8 @@ deploy:packages: - build:packages tags: - villas-deploy + only: + - master # Stage: docker @@ -173,9 +175,20 @@ deploy:docker: script: - make docker - make deploy-docker - - make deploy-docker-dev dependencies: - build:packages tags: - shell - linux + only: + - master + +deploy:docker-dev: + stage: docker + script: + - make deploy-docker-dev + tags: + - shell + - linux + only: + - develop