From 7eddcf2d6432bf98aee98c187490d6873846b878 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Fri, 26 Jun 2020 11:02:15 +0200
Subject: [PATCH] [ci] Fixed web-job conditions.
---
scripts/ci/extends/rules.yml | 4 ++++
scripts/ci/jobs/web.yml | 18 +++++++++---------
2 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/scripts/ci/extends/rules.yml b/scripts/ci/extends/rules.yml
index 3ef28e74fdc..cce6691058d 100644
--- a/scripts/ci/extends/rules.yml
+++ b/scripts/ci/extends/rules.yml
@@ -8,3 +8,7 @@
rules:
- when: manual
allow_failure: true
+
+.rules-master:
+ rules:
+ - if: '$CI_COMMIT_BRANCH == "master"'
diff --git a/scripts/ci/jobs/web.yml b/scripts/ci/jobs/web.yml
index ad2c316c658..17c5a801591 100644
--- a/scripts/ci/jobs/web.yml
+++ b/scripts/ci/jobs/web.yml
@@ -4,7 +4,7 @@ web url checker:
tags:
- docker
extends:
- - .rules-master-manual
+ - .rules-manual
needs: []
image:
name: $WEB_IMAGE
@@ -28,9 +28,9 @@ preview web site:
- yarn
- hugo --environment staging
rules:
- - if: '$CI_COMMIT_BRANCH != "master"'
+ - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
changes:
- - web/
+ - web/**/*
- scripts/ci/jobs/web.yml
artifacts:
expose_as: 'Web Preview'
@@ -45,18 +45,18 @@ preview web site:
deploy web site:
stage: package
image: $WEB_IMAGE
- needs: ["web url checker"]
+ needs: []
+ rules:
+ - if: '$CI_COMMIT_BRANCH == "master"'
+ changes:
+ - web/**/*
+ - scripts/ci/jobs/web.yml
script:
- cd web
- yarn
- hugo
- netlify deploy --prod --dir=public
- node_modules/.bin/hugo-algolia --toml -s
- rules:
- - if: '$CI_COMMIT_BRANCH == "master"'
- changes:
- - web/
- - scripts/ci/jobs/web.yml
cache:
paths:
- web/node_modules
--
GitLab