From db1afa04694c7c0afe05f9e29b9d8fb54ed40dbd Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Thu, 11 Jun 2020 12:50:16 +0200
Subject: [PATCH] [ci] Fix rules for master only.
---
scripts/ci/extends/rules-master-manual.yml | 2 +-
scripts/ci/jobs/build-gui-linux.yml | 2 +-
scripts/ci/jobs/build-gui-mac.yml | 2 +-
scripts/ci/jobs/build-gui-win.yml | 2 +-
scripts/ci/jobs/build-linux-frontend.yml | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/scripts/ci/extends/rules-master-manual.yml b/scripts/ci/extends/rules-master-manual.yml
index 57e526cd403..35c0f41b334 100644
--- a/scripts/ci/extends/rules-master-manual.yml
+++ b/scripts/ci/extends/rules-master-manual.yml
@@ -1,5 +1,5 @@
.rules-master-manual:
rules:
- - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"'
+ - if: '$CI_COMMIT_BRANCH == "master"'
- when: manual
allow_failure: true
diff --git a/scripts/ci/jobs/build-gui-linux.yml b/scripts/ci/jobs/build-gui-linux.yml
index ad4040fa255..c69a7edd4bc 100644
--- a/scripts/ci/jobs/build-gui-linux.yml
+++ b/scripts/ci/jobs/build-gui-linux.yml
@@ -8,7 +8,7 @@ build gui linux:
- job: build linux
artifacts: false
rules:
- - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"'
+ - if: '$CI_COMMIT_BRANCH == "master"'
- changes:
- Applications/DataExplorer/**/*
- when: manual
diff --git a/scripts/ci/jobs/build-gui-mac.yml b/scripts/ci/jobs/build-gui-mac.yml
index 4b8d86c3b0d..476482cffc6 100644
--- a/scripts/ci/jobs/build-gui-mac.yml
+++ b/scripts/ci/jobs/build-gui-mac.yml
@@ -7,7 +7,7 @@ build gui mac:
tags:
- mac
rules:
- - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"'
+ - if: '$CI_COMMIT_BRANCH == "master"'
- changes:
- Applications/DataExplorer/**/*
- when: manual
diff --git a/scripts/ci/jobs/build-gui-win.yml b/scripts/ci/jobs/build-gui-win.yml
index d1912391636..504e63bdf75 100644
--- a/scripts/ci/jobs/build-gui-win.yml
+++ b/scripts/ci/jobs/build-gui-win.yml
@@ -5,7 +5,7 @@ build gui win:
- job: build win
artifacts: false
rules:
- - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"'
+ - if: '$CI_COMMIT_BRANCH == "master"'
- changes:
- Applications/DataExplorer/**/*
- when: manual
diff --git a/scripts/ci/jobs/build-linux-frontend.yml b/scripts/ci/jobs/build-linux-frontend.yml
index 113ec15e129..594264ef42a 100644
--- a/scripts/ci/jobs/build-linux-frontend.yml
+++ b/scripts/ci/jobs/build-linux-frontend.yml
@@ -3,7 +3,7 @@ build linux frontend:
tags:
- frontend1
rules:
- - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"'
+ - if: '$CI_COMMIT_BRANCH == "master"'
- when: manual
allow_failure: true
--
GitLab