From 393d6d2bdd18fc5e0a3896497c72fb5ca140c876 Mon Sep 17 00:00:00 2001 From: Administrator Date: Thu, 2 Mar 2023 17:29:29 +0000 Subject: [PATCH] Update 4 files - /build/composer.yml - /build/npm.yml - /security/composer.yml - /security/npm.yml --- build/composer.yml | 3 ++- build/npm.yml | 3 ++- security/composer.yml | 3 ++- security/npm.yml | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/build/composer.yml b/build/composer.yml index b4d087f..cf69c3e 100644 --- a/build/composer.yml +++ b/build/composer.yml @@ -20,4 +20,5 @@ composer-build: optional: true rules: - if: $CI_PIPELINE_SOURCE == "merge_request_event" - - if: $CI_COMMIT_BRANCH == "develop" \ No newline at end of file + - if: $CI_COMMIT_BRANCH == "develop" || $CI_COMMIT_BRANCH == "trunk" || $CI_COMMIT_BRANCH == "master" || $CI_COMMIT_BRANCH == "main" + - if: $CI_COMMIT_TAG != null \ No newline at end of file diff --git a/build/npm.yml b/build/npm.yml index 308c750..3674029 100644 --- a/build/npm.yml +++ b/build/npm.yml @@ -20,4 +20,5 @@ npm-build: optional: true rules: - if: $CI_PIPELINE_SOURCE == "merge_request_event" - - if: $CI_COMMIT_BRANCH == "develop" + - if: $CI_COMMIT_BRANCH == "develop" || $CI_COMMIT_BRANCH == "trunk" || $CI_COMMIT_BRANCH == "master" || $CI_COMMIT_BRANCH == "main" + - if: $CI_COMMIT_TAG != null diff --git a/security/composer.yml b/security/composer.yml index 80dfd4a..9d6bbd6 100644 --- a/security/composer.yml +++ b/security/composer.yml @@ -11,4 +11,5 @@ composer-security: allow_failure: true rules: - if: $CI_PIPELINE_SOURCE == "merge_request_event" - - if: $CI_COMMIT_BRANCH == "develop" \ No newline at end of file + - if: $CI_COMMIT_BRANCH == "develop" || $CI_COMMIT_BRANCH == "trunk" || $CI_COMMIT_BRANCH == "master" || $CI_COMMIT_BRANCH == "main" + - if: $CI_COMMIT_TAG != null \ No newline at end of file diff --git a/security/npm.yml b/security/npm.yml index 24d5b1b..47b934e 100644 --- a/security/npm.yml +++ b/security/npm.yml @@ -13,4 +13,5 @@ npm-security: allow_failure: true rules: - if: $CI_PIPELINE_SOURCE == "merge_request_event" - - if: $CI_COMMIT_BRANCH == "develop" \ No newline at end of file + - if: $CI_COMMIT_BRANCH == "develop" || $CI_COMMIT_BRANCH == "trunk" || $CI_COMMIT_BRANCH == "master" || $CI_COMMIT_BRANCH == "main" + - if: $CI_COMMIT_TAG != null \ No newline at end of file