From 2b74c54f9f68d54fed524ff89a9aef545b1b3bd5 Mon Sep 17 00:00:00 2001 From: Davi Koscianski Vidal Date: Tue, 3 Dec 2024 17:56:23 +0100 Subject: [PATCH 1/2] NO-JIRA Fixes private SonarQube Community Build tag --- .cirrus/tasks.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.cirrus/tasks.yml b/.cirrus/tasks.yml index 82f647b3..af884549 100644 --- a/.cirrus/tasks.yml +++ b/.cirrus/tasks.yml @@ -17,8 +17,9 @@ env: GCLOUD_STAGING_PRODUCT_NAME: sonarqube-dce-staging CURRENT_LTA_VERSION: 9.9.7 CURRENT_VERSION: 10.8.0 - NEXT_VERSION: 10.9.0 - COMMUNITY_BUILD_VERSION: 100206 + NEXT_VERSION: 2025.1 + # Must be in the format YY.MM.0-###### where ###### is the build number + COMMUNITY_BUILD_VERSION: 24.12.0-100206 build_server_hw_template: &BUILD_SERVER_HW_TEMPLATE @@ -97,7 +98,7 @@ multi_arch_build_task_template: &multi_arch_build_task_template multi_arch_build_9_x_task: <<: *multi_arch_build_task_template - skip: "!changesInclude('9/**/*')" + skip: "!changesInclude('9/**/*') || !changesInclude('.cirrus/*')" env: matrix: - version: 9/community @@ -113,7 +114,7 @@ multi_arch_build_9_x_task: multi_arch_build_10_x_task: <<: *multi_arch_build_task_template - skip: "!changesInclude('10/**/*')" + skip: "!changesInclude('10/**/*') || !changesInclude('.cirrus/*')" env: matrix: - version: 10/developer @@ -127,7 +128,7 @@ multi_arch_build_10_x_task: multi_arch_build_community_build_task: <<: *multi_arch_build_task_template - skip: "!changesInclude('community-build/*')" + skip: "!changesInclude('community-build/*') || !changesInclude('.cirrus/*')" env: matrix: - version: community-build @@ -188,7 +189,7 @@ multi_arch_test_task_template: &multi_arch_test_task_template multi_arch_test_9_x_task: <<: *multi_arch_test_task_template - skip: "!changesInclude('9/**/*')" + skip: "!changesInclude('9/**/*') || !changesInclude('.cirrus/*')" matrix: - env: CIRRUS_ARCH: arm64 @@ -212,7 +213,7 @@ multi_arch_test_9_x_task: multi_arch_test_10_x_task: <<: *multi_arch_test_task_template - skip: "!changesInclude('10/**/*')" + skip: "!changesInclude('10/**/*') || !changesInclude('.cirrus/*')" matrix: - env: CIRRUS_ARCH: arm64 @@ -234,7 +235,7 @@ multi_arch_test_10_x_task: multi_arch_test_community_build_task: <<: *multi_arch_test_task_template - skip: "!changesInclude('community-build/*')" + skip: "!changesInclude('community-build/*') || !changesInclude('.cirrus/*')" matrix: - env: CIRRUS_ARCH: arm64 From 0346d404ea2658f97cd64632a9f6bfd0a9f052c4 Mon Sep 17 00:00:00 2001 From: Davi Koscianski Vidal Date: Tue, 3 Dec 2024 17:58:39 +0100 Subject: [PATCH 2/2] Fixes logic --- .cirrus/tasks.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.cirrus/tasks.yml b/.cirrus/tasks.yml index af884549..f2e5d052 100644 --- a/.cirrus/tasks.yml +++ b/.cirrus/tasks.yml @@ -98,7 +98,7 @@ multi_arch_build_task_template: &multi_arch_build_task_template multi_arch_build_9_x_task: <<: *multi_arch_build_task_template - skip: "!changesInclude('9/**/*') || !changesInclude('.cirrus/*')" + skip: "!changesInclude('9/**/*') && !changesInclude('.cirrus/*')" env: matrix: - version: 9/community @@ -114,7 +114,7 @@ multi_arch_build_9_x_task: multi_arch_build_10_x_task: <<: *multi_arch_build_task_template - skip: "!changesInclude('10/**/*') || !changesInclude('.cirrus/*')" + skip: "!changesInclude('10/**/*') && !changesInclude('.cirrus/*')" env: matrix: - version: 10/developer @@ -128,7 +128,7 @@ multi_arch_build_10_x_task: multi_arch_build_community_build_task: <<: *multi_arch_build_task_template - skip: "!changesInclude('community-build/*') || !changesInclude('.cirrus/*')" + skip: "!changesInclude('community-build/*') && !changesInclude('.cirrus/*')" env: matrix: - version: community-build @@ -189,7 +189,7 @@ multi_arch_test_task_template: &multi_arch_test_task_template multi_arch_test_9_x_task: <<: *multi_arch_test_task_template - skip: "!changesInclude('9/**/*') || !changesInclude('.cirrus/*')" + skip: "!changesInclude('9/**/*') && !changesInclude('.cirrus/*')" matrix: - env: CIRRUS_ARCH: arm64 @@ -213,7 +213,7 @@ multi_arch_test_9_x_task: multi_arch_test_10_x_task: <<: *multi_arch_test_task_template - skip: "!changesInclude('10/**/*') || !changesInclude('.cirrus/*')" + skip: "!changesInclude('10/**/*') && !changesInclude('.cirrus/*')" matrix: - env: CIRRUS_ARCH: arm64 @@ -235,7 +235,7 @@ multi_arch_test_10_x_task: multi_arch_test_community_build_task: <<: *multi_arch_test_task_template - skip: "!changesInclude('community-build/*') || !changesInclude('.cirrus/*')" + skip: "!changesInclude('community-build/*') && !changesInclude('.cirrus/*')" matrix: - env: CIRRUS_ARCH: arm64