From d565b42ed959cd68150caf00cc3194ac36836dfa Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen.haas@lakedrops.com>
Date: Fri, 17 Nov 2023 10:37:33 +0100
Subject: [PATCH] gitlab-ci-cd/drupal#64 CI improvements for private modules
---
private-modules.yml | 49 +++++++++++++++++----------------------------
1 file changed, 18 insertions(+), 31 deletions(-)
diff --git a/private-modules.yml b/private-modules.yml
index 07b86c5..a4fca19 100644
--- a/private-modules.yml
+++ b/private-modules.yml
@@ -5,51 +5,38 @@ default:
workflow:
rules:
- - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop"
- variables:
- PRIVATE_MODULE_TESTS: "false"
- PRIVATE_MODULE_BUILD: "true"
- when: always
- - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main"
- variables:
- PRIVATE_MODULE_TESTS: "false"
- PRIVATE_MODULE_BUILD: "true"
- when: always
- - if: $CI_COMMIT_BRANCH == "develop" || $CI_COMMIT_BRANCH =~ "/^feature\/.*/"
- variables:
- PRIVATE_MODULE_TESTS: "true"
- PRIVATE_MODULE_BUILD: "true"
- when: always
+ - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+ - if: $CI_COMMIT_BRANCH == "main" || $CI_COMMIT_BRANCH == "develop" || $CI_COMMIT_BRANCH =~ "/^feature\/.*/"
- if: $CI_COMMIT_TAG
- variables:
- PRIVATE_MODULE_TESTS: "false"
- PRIVATE_MODULE_BUILD: "true"
- when: always
- - when: never
include:
- remote: https://git.drupalcode.org/project/gitlab_templates/-/raw/1.0.x/includes/include.drupalci.main.yml
rules:
- - if: $PRIVATE_MODULE_TESTS == "true"
- when: always
+ - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+ when: never
+ - if: $CI_COMMIT_TAG
+ when: never
- remote: https://git.drupalcode.org/project/gitlab_templates/-/raw/1.0.x/includes/include.drupalci.variables.yml
rules:
- - if: $PRIVATE_MODULE_TESTS == "true"
- when: always
+ - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+ when: never
+ - if: $CI_COMMIT_TAG
+ when: never
- remote: https://git.drupalcode.org/project/gitlab_templates/-/raw/1.0.x/includes/include.drupalci.workflows.yml
rules:
- - if: $PRIVATE_MODULE_TESTS == "true"
- when: always
+ - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+ when: never
+ - if: $CI_COMMIT_TAG
+ when: never
- local: private-modules-overrides.yml
rules:
- - if: $PRIVATE_MODULE_TESTS == "true"
- when: always
+ - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+ when: never
+ - if: $CI_COMMIT_TAG
+ when: never
- project: gitlab-ci-cd/general
ref: main
file: '/mixins.yml'
- project: 'gitlab-ci-cd/composer-packages'
ref: main
file: '/composer-packages.yml'
- rules:
- - if: $PRIVATE_MODULE_BUILD == "true"
- when: always
--
GitLab