Browse Source

BUILD-1351 Remove dogfood references

tags/9.5.0.56709
Malena Ebert 2 years ago
parent
commit
ef096f211f
3 changed files with 7 additions and 11 deletions
  1. 4
    8
      .cirrus.yml
  2. 1
    1
      README.md
  3. 2
    2
      build.gradle

+ 4
- 8
.cirrus.yml View File

@@ -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

+ 1
- 1
README.md View File

@@ -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?
--------------------------

+ 2
- 2
build.gradle View File

@@ -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")
}
}

Loading…
Cancel
Save