From 657f6d22b6419fe906d49b0e9145fb8baa6be440 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Wed, 24 Jun 2020 11:14:42 +0200
Subject: [PATCH] [ci] Fix web job run conditions.
---
scripts/ci/jobs/web.yml | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/scripts/ci/jobs/web.yml b/scripts/ci/jobs/web.yml
index 51cd4dc1dd3..e44008364bf 100644
--- a/scripts/ci/jobs/web.yml
+++ b/scripts/ci/jobs/web.yml
@@ -3,8 +3,8 @@ web url checker:
tags:
- docker
extends:
- - .defaults
- .rules-master-manual
+ needs: []
image:
name: $WEB_IMAGE
script:
@@ -28,7 +28,7 @@ preview web site:
- hugo --environment staging
rules:
- if: '$CI_COMMIT_BRANCH != "master"'
- - changes:
+ changes:
- web/
- scripts/ci/jobs/web.yml
artifacts:
@@ -44,8 +44,7 @@ preview web site:
deploy web site:
stage: package
image: $WEB_IMAGE
- extends:
- - .defaults
+ needs: ["web url checker"]
script:
- cd web
- yarn
@@ -54,7 +53,7 @@ deploy web site:
- node_modules/.bin/hugo-algolia --toml -s
rules:
- if: '$CI_COMMIT_BRANCH == "master"'
- - changes:
+ changes:
- web/
- scripts/ci/jobs/web.yml
cache:
--
GitLab