diff options
| author | Malena Ebert <63863184+malena-ebert-sonarsource@users.noreply.github.com> | 2022-04-14 13:17:46 +0200 |
|---|---|---|
| committer | sonartech <sonartech@sonarsource.com> | 2022-04-14 20:03:30 +0000 |
| commit | ef096f211fb7bee75b45430bbf37aadbf6fb7401 (patch) | |
| tree | 74353f2982782a496caa56b8fb6b4626914a6002 | |
| parent | 2e251c1d86f3627413b44d2c8641e6c92d67bc25 (diff) | |
| download | sonarqube-ef096f211fb7bee75b45430bbf37aadbf6fb7401.tar.gz sonarqube-ef096f211fb7bee75b45430bbf37aadbf6fb7401.zip | |
BUILD-1351 Remove dogfood references
| -rw-r--r-- | .cirrus.yml | 12 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | build.gradle | 4 |
3 files changed, 7 insertions, 11 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 07309701d3c..1746b98429c 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -27,7 +27,7 @@ env: # (example of error: "Hard resetting to c968ecaf7a1942dacecd78480b3751ac74d53c33...Failed to force reset to c968ecaf7a1942dacecd78480b3751ac74d53c33: object not found!") CIRRUS_CLONE_DEPTH: 50 -auto_cancellation: $CIRRUS_BRANCH != 'master' && $CIRRUS_BRANCH !=~ 'branch.*' && $CIRRUS_BRANCH != 'dogfood-on-next' +auto_cancellation: $CIRRUS_BRANCH != 'master' && $CIRRUS_BRANCH !=~ 'branch.*' only_nightly_depending_on_build_template: &ONLY_NIGHTLY_DEPENDING_ON_BUILD_TEMPLATE depends_on: build @@ -42,15 +42,11 @@ only_upon_sql_changes_or_nightly_depending_on_build_template: &ONLY_UPON_SQL_CHA changesInclude('server/sonar-db-dao/**/*Mapper.xml', 'server/sonar-db-migration/**/DbVersion*.java', 'server/sonar-db-dao/**/*Dao.java') only_default_branches_template: &ONLY_DEFAULT_BRANCHES_TEMPLATE - only_if: >- - $CIRRUS_BRANCH !=~ "dogfood/.*" && - $CIRRUS_BRANCH != "public_master" + only_if: $CIRRUS_BRANCH != "public_master" only_default_depending_on_build_template: &ONLY_DEFAULT_DEPENDING_ON_BUILD_TEMPLATE depends_on: build - only_if: >- - $CIRRUS_BRANCH !=~ "dogfood/.*" && - $CIRRUS_BRANCH != "public_master" + only_if: $CIRRUS_BRANCH != "public_master" docker_build_container_template: &GKE_CONTAINER_TEMPLATE dockerfile: private/docker/Dockerfile-build @@ -502,7 +498,7 @@ deploy_docs_task: package_docker_task: depends_on: promote - only_if: $CIRRUS_BRANCH == 'dogfood-on-next' || $CIRRUS_BRANCH == 'master' + only_if: $CIRRUS_BRANCH == 'master' gce_instance: image_project: sonarqube-team image_family: docker-builder diff --git a/README.md b/README.md index 2e2769b044b..4aa35a6181e 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ Links * [SonarSource](https://www.sonarsource.com), author of SonarQube * [Issue tracking](https://jira.sonarsource.com/browse/SONAR/), read-only. Only SonarSourcers can create tickets. * [Responsible Disclosure](https://community.sonarsource.com/t/responsible-vulnerability-disclosure/9317) -* [Dogfood](https://next.sonarqube.com/sonarqube) instance of the next SonarQube version +* [Next](https://next.sonarqube.com/sonarqube) instance of the next SonarQube version Have Question or Feedback? -------------------------- diff --git a/build.gradle b/build.gradle index c356e8f8e3a..cd7aa7aeebb 100644 --- a/build.gradle +++ b/build.gradle @@ -535,7 +535,7 @@ subprojects { useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword) required { def branch = System.getenv()["GITHUB_BRANCH"] - return (branch in ['master', 'dogfood-on-next'] || branch ==~ 'branch-[\\d.]+') && + return (branch in ['master'] || branch ==~ 'branch-[\\d.]+') && gradle.taskGraph.hasTask(":artifactoryPublish") } sign publishing.publications @@ -545,7 +545,7 @@ subprojects { onlyIf { def branch = System.getenv()["GITHUB_BRANCH"] return !artifactoryPublish.skip && - (branch in ['master', 'dogfood-on-next'] || branch ==~ 'branch-[\\d.]+') && + (branch in ['master'] || branch ==~ 'branch-[\\d.]+') && gradle.taskGraph.hasTask(":artifactoryPublish") } } |