From e2c9481970b6437578aab96e0b5b1e84f07c323f Mon Sep 17 00:00:00 2001 From: Davi Koscianski Vidal Date: Mon, 16 Dec 2024 14:53:20 +0100 Subject: [PATCH 1/4] REL-3457 Release SonarQube Server 10.8.1 --- 10/datacenter/app/Dockerfile | 2 +- 10/datacenter/search/Dockerfile | 2 +- 10/developer/Dockerfile | 2 +- 10/enterprise/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/10/datacenter/app/Dockerfile b/10/datacenter/app/Dockerfile index e7bc0ffd..ca28a0e2 100644 --- a/10/datacenter/app/Dockerfile +++ b/10/datacenter/app/Dockerfile @@ -14,7 +14,7 @@ ENV LANG='en_US.UTF-8' \ # # SonarQube setup # -ARG SONARQUBE_VERSION=10.8.0.100206 +ARG SONARQUBE_VERSION=10.8.1.101050 ARG SONARQUBE_ZIP_URL=https://binaries.sonarsource.com/CommercialDistribution/sonarqube-datacenter/sonarqube-datacenter-${SONARQUBE_VERSION}.zip ENV DOCKER_RUNNING="true" \ JAVA_HOME='/opt/java/openjdk' \ diff --git a/10/datacenter/search/Dockerfile b/10/datacenter/search/Dockerfile index 5e41dd76..a6aac0df 100644 --- a/10/datacenter/search/Dockerfile +++ b/10/datacenter/search/Dockerfile @@ -14,7 +14,7 @@ ENV LANG='en_US.UTF-8' \ # # SonarQube setup # -ARG SONARQUBE_VERSION=10.8.0.100206 +ARG SONARQUBE_VERSION=10.8.1.101050 ARG SONARQUBE_ZIP_URL=https://binaries.sonarsource.com/CommercialDistribution/sonarqube-datacenter/sonarqube-datacenter-${SONARQUBE_VERSION}.zip ENV DOCKER_RUNNING="true" \ JAVA_HOME='/opt/java/openjdk' \ diff --git a/10/developer/Dockerfile b/10/developer/Dockerfile index 7c26227e..e08aac9e 100644 --- a/10/developer/Dockerfile +++ b/10/developer/Dockerfile @@ -14,7 +14,7 @@ ENV LANG='en_US.UTF-8' \ # # SonarQube setup # -ARG SONARQUBE_VERSION=10.8.0.100206 +ARG SONARQUBE_VERSION=10.8.1.101050 ARG SONARQUBE_ZIP_URL=https://binaries.sonarsource.com/CommercialDistribution/sonarqube-developer/sonarqube-developer-${SONARQUBE_VERSION}.zip ENV DOCKER_RUNNING="true" \ JAVA_HOME='/opt/java/openjdk' \ diff --git a/10/enterprise/Dockerfile b/10/enterprise/Dockerfile index e09cc24e..b57abcae 100644 --- a/10/enterprise/Dockerfile +++ b/10/enterprise/Dockerfile @@ -14,7 +14,7 @@ ENV LANG='en_US.UTF-8' \ # # SonarQube setup # -ARG SONARQUBE_VERSION=10.8.0.100206 +ARG SONARQUBE_VERSION=10.8.1.101050 ARG SONARQUBE_ZIP_URL=https://binaries.sonarsource.com/CommercialDistribution/sonarqube-enterprise/sonarqube-enterprise-${SONARQUBE_VERSION}.zip ENV DOCKER_RUNNING="true" \ JAVA_HOME='/opt/java/openjdk' \ From 9bcbc9fdb12979f47c81fe92bf8cdf15711cbec1 Mon Sep 17 00:00:00 2001 From: Davi Koscianski Vidal Date: Mon, 16 Dec 2024 15:36:25 +0100 Subject: [PATCH 2/4] REL-3457 Release SonarQube Server 10.8.1 --- 10/datacenter/app/Dockerfile | 2 +- 10/datacenter/search/Dockerfile | 2 +- 10/developer/Dockerfile | 2 +- 10/enterprise/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/10/datacenter/app/Dockerfile b/10/datacenter/app/Dockerfile index ca28a0e2..66db41a5 100644 --- a/10/datacenter/app/Dockerfile +++ b/10/datacenter/app/Dockerfile @@ -14,7 +14,7 @@ ENV LANG='en_US.UTF-8' \ # # SonarQube setup # -ARG SONARQUBE_VERSION=10.8.1.101050 +ARG SONARQUBE_VERSION=10.8.1.101184 ARG SONARQUBE_ZIP_URL=https://binaries.sonarsource.com/CommercialDistribution/sonarqube-datacenter/sonarqube-datacenter-${SONARQUBE_VERSION}.zip ENV DOCKER_RUNNING="true" \ JAVA_HOME='/opt/java/openjdk' \ diff --git a/10/datacenter/search/Dockerfile b/10/datacenter/search/Dockerfile index a6aac0df..c922d12d 100644 --- a/10/datacenter/search/Dockerfile +++ b/10/datacenter/search/Dockerfile @@ -14,7 +14,7 @@ ENV LANG='en_US.UTF-8' \ # # SonarQube setup # -ARG SONARQUBE_VERSION=10.8.1.101050 +ARG SONARQUBE_VERSION=10.8.1.101184 ARG SONARQUBE_ZIP_URL=https://binaries.sonarsource.com/CommercialDistribution/sonarqube-datacenter/sonarqube-datacenter-${SONARQUBE_VERSION}.zip ENV DOCKER_RUNNING="true" \ JAVA_HOME='/opt/java/openjdk' \ diff --git a/10/developer/Dockerfile b/10/developer/Dockerfile index e08aac9e..61354424 100644 --- a/10/developer/Dockerfile +++ b/10/developer/Dockerfile @@ -14,7 +14,7 @@ ENV LANG='en_US.UTF-8' \ # # SonarQube setup # -ARG SONARQUBE_VERSION=10.8.1.101050 +ARG SONARQUBE_VERSION=10.8.1.101184 ARG SONARQUBE_ZIP_URL=https://binaries.sonarsource.com/CommercialDistribution/sonarqube-developer/sonarqube-developer-${SONARQUBE_VERSION}.zip ENV DOCKER_RUNNING="true" \ JAVA_HOME='/opt/java/openjdk' \ diff --git a/10/enterprise/Dockerfile b/10/enterprise/Dockerfile index b57abcae..1f3d3bbc 100644 --- a/10/enterprise/Dockerfile +++ b/10/enterprise/Dockerfile @@ -14,7 +14,7 @@ ENV LANG='en_US.UTF-8' \ # # SonarQube setup # -ARG SONARQUBE_VERSION=10.8.1.101050 +ARG SONARQUBE_VERSION=10.8.1.101184 ARG SONARQUBE_ZIP_URL=https://binaries.sonarsource.com/CommercialDistribution/sonarqube-enterprise/sonarqube-enterprise-${SONARQUBE_VERSION}.zip ENV DOCKER_RUNNING="true" \ JAVA_HOME='/opt/java/openjdk' \ From 0332ae86ab087da13b08b23360695cc1fa40ca00 Mon Sep 17 00:00:00 2001 From: Davi Koscianski Vidal Date: Mon, 16 Dec 2024 18:10:56 +0100 Subject: [PATCH 3/4] REL-3457 Release SonarQube Server 10.8.1 --- .cirrus/tasks.yml | 2 +- 10/datacenter/app/Dockerfile | 2 +- 10/datacenter/search/Dockerfile | 2 +- 10/developer/Dockerfile | 2 +- 10/enterprise/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.cirrus/tasks.yml b/.cirrus/tasks.yml index 82f647b3..86bd1495 100644 --- a/.cirrus/tasks.yml +++ b/.cirrus/tasks.yml @@ -16,7 +16,7 @@ env: GCLOUD_STAGING_REGISTRY: gcr.io/sonarqube-marketplace-provider GCLOUD_STAGING_PRODUCT_NAME: sonarqube-dce-staging CURRENT_LTA_VERSION: 9.9.7 - CURRENT_VERSION: 10.8.0 + CURRENT_VERSION: 10.8.1 NEXT_VERSION: 10.9.0 COMMUNITY_BUILD_VERSION: 100206 diff --git a/10/datacenter/app/Dockerfile b/10/datacenter/app/Dockerfile index 66db41a5..1d2a0a7a 100644 --- a/10/datacenter/app/Dockerfile +++ b/10/datacenter/app/Dockerfile @@ -14,7 +14,7 @@ ENV LANG='en_US.UTF-8' \ # # SonarQube setup # -ARG SONARQUBE_VERSION=10.8.1.101184 +ARG SONARQUBE_VERSION=10.8.1.101195 ARG SONARQUBE_ZIP_URL=https://binaries.sonarsource.com/CommercialDistribution/sonarqube-datacenter/sonarqube-datacenter-${SONARQUBE_VERSION}.zip ENV DOCKER_RUNNING="true" \ JAVA_HOME='/opt/java/openjdk' \ diff --git a/10/datacenter/search/Dockerfile b/10/datacenter/search/Dockerfile index c922d12d..48758f86 100644 --- a/10/datacenter/search/Dockerfile +++ b/10/datacenter/search/Dockerfile @@ -14,7 +14,7 @@ ENV LANG='en_US.UTF-8' \ # # SonarQube setup # -ARG SONARQUBE_VERSION=10.8.1.101184 +ARG SONARQUBE_VERSION=10.8.1.101195 ARG SONARQUBE_ZIP_URL=https://binaries.sonarsource.com/CommercialDistribution/sonarqube-datacenter/sonarqube-datacenter-${SONARQUBE_VERSION}.zip ENV DOCKER_RUNNING="true" \ JAVA_HOME='/opt/java/openjdk' \ diff --git a/10/developer/Dockerfile b/10/developer/Dockerfile index 61354424..a7e70bc7 100644 --- a/10/developer/Dockerfile +++ b/10/developer/Dockerfile @@ -14,7 +14,7 @@ ENV LANG='en_US.UTF-8' \ # # SonarQube setup # -ARG SONARQUBE_VERSION=10.8.1.101184 +ARG SONARQUBE_VERSION=10.8.1.101195 ARG SONARQUBE_ZIP_URL=https://binaries.sonarsource.com/CommercialDistribution/sonarqube-developer/sonarqube-developer-${SONARQUBE_VERSION}.zip ENV DOCKER_RUNNING="true" \ JAVA_HOME='/opt/java/openjdk' \ diff --git a/10/enterprise/Dockerfile b/10/enterprise/Dockerfile index 1f3d3bbc..9386c577 100644 --- a/10/enterprise/Dockerfile +++ b/10/enterprise/Dockerfile @@ -14,7 +14,7 @@ ENV LANG='en_US.UTF-8' \ # # SonarQube setup # -ARG SONARQUBE_VERSION=10.8.1.101184 +ARG SONARQUBE_VERSION=10.8.1.101195 ARG SONARQUBE_ZIP_URL=https://binaries.sonarsource.com/CommercialDistribution/sonarqube-enterprise/sonarqube-enterprise-${SONARQUBE_VERSION}.zip ENV DOCKER_RUNNING="true" \ JAVA_HOME='/opt/java/openjdk' \ From 180ffeaf7f3de43fc3ad5c0dc29353ac36b86c40 Mon Sep 17 00:00:00 2001 From: Davi Koscianski Vidal Date: Mon, 16 Dec 2024 18:14:12 +0100 Subject: [PATCH 4/4] Pick changes from master to CI --- .cirrus/tasks.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.cirrus/tasks.yml b/.cirrus/tasks.yml index 86bd1495..53e5bb81 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.1 - 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