From 9d29f60c4720a2f45557f74c7f64b64dd46583dc Mon Sep 17 00:00:00 2001 From: Sylvester Joosten <sjoosten@anl.gov> Date: Tue, 1 Dec 2020 16:03:03 +0000 Subject: [PATCH] fixing CI --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a95406254..8222e1ab7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,7 +23,7 @@ builder:unstable: tags: - silicon rules: - - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_SOURCE_BRANCH != develop' + - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_SOURCE_BRANCH != "develop"' when: always - if: '$CI_COMMIT_BRANCH == "develop"' when: always @@ -55,7 +55,7 @@ config:unstable: tags: - silicon rules: - - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_SOURCE_BRANCH != develop' + - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_SOURCE_BRANCH != "develop"' when: manual - if: '$CI_COMMIT_BRANCH == "develop"' when: always @@ -87,7 +87,7 @@ release:unstable: tags: - silicon rules: - - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_SOURCE_BRANCH != develop' + - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_SOURCE_BRANCH != "develop"' when: manual - if: '$CI_COMMIT_BRANCH == "develop"' when: always @@ -131,7 +131,7 @@ release:singularity:unstable: - develop needs: ["release:unstable"] rules: - - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_SOURCE_BRANCH != develop' + - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_SOURCE_BRANCH != "develop"' when: manual - if: '$CI_COMMIT_BRANCH == "develop"' when: manual -- GitLab