From 919aa63a773974a663ac6704e379257e5827a012 Mon Sep 17 00:00:00 2001 From: DeveloperDurp Date: Mon, 6 May 2024 04:55:40 -0500 Subject: [PATCH] update --- pipelines/go-build.yml | 4 ++-- rules/rules.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pipelines/go-build.yml b/pipelines/go-build.yml index 88adcd4..e8eb0a3 100644 --- a/pipelines/go-build.yml +++ b/pipelines/go-build.yml @@ -24,7 +24,7 @@ generate_sbom: optional: true artifacts: true rules: - - !reference [.default_mr_rules, rules] + - !reference [.mr_only_rules, rules] generate_cve: extends: .generate_cve @@ -33,7 +33,7 @@ generate_cve: - job: generate_sbom artifacts: true rules: - - !reference [.default_mr_rules, rules] + - !reference [.mr_only_rules, rules] version: extends: .version diff --git a/rules/rules.yml b/rules/rules.yml index 5a48f89..e2626e0 100644 --- a/rules/rules.yml +++ b/rules/rules.yml @@ -8,10 +8,10 @@ - if: $CI_MERGE_REQUEST_IID exists: - "sonar-project.properties" - - if: $CI_PIPELINE_SOURCE == "push" && $CI_PIPELINE_SOURCE == $CI_DEFAULT_BRANCH + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH exists: - "sonar-project.properties" - - if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH =~ '/^release/' + - if: $CI_COMMIT_BRANCH =~ '/^release/' exists: - "sonar-project.properties"