mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge pull request #19658 from dreis2211
* pr/19658: Polish "Pass CI branch parameter to build scan" Pass CI branch parameter to build scan Closes gh-19658
This commit is contained in:
commit
e1a557ef3b
@ -210,6 +210,7 @@ jobs:
|
||||
image: spring-boot-ci-image
|
||||
file: git-repo/ci/tasks/build-project.yml
|
||||
params:
|
||||
BRANCH: ((branch))
|
||||
GRADLE_ENTERPRISE_ACCESS_KEY: ((gradle_enterprise_secret_access_key))
|
||||
GRADLE_ENTERPRISE_CACHE_USER: ((gradle_enterprise_cache_user.username))
|
||||
GRADLE_ENTERPRISE_CACHE_PASSWORD: ((gradle_enterprise_cache_user.password))
|
||||
@ -299,6 +300,7 @@ jobs:
|
||||
image: spring-boot-jdk11-ci-image
|
||||
file: git-repo/ci/tasks/build-project.yml
|
||||
params:
|
||||
BRANCH: ((branch))
|
||||
GRADLE_ENTERPRISE_ACCESS_KEY: ((gradle_enterprise_secret_access_key))
|
||||
GRADLE_ENTERPRISE_CACHE_USER: ((gradle_enterprise_cache_user.username))
|
||||
GRADLE_ENTERPRISE_CACHE_PASSWORD: ((gradle_enterprise_cache_user.password))
|
||||
@ -336,6 +338,7 @@ jobs:
|
||||
image: spring-boot-jdk13-ci-image
|
||||
file: git-repo/ci/tasks/build-project.yml
|
||||
params:
|
||||
BRANCH: ((branch))
|
||||
GRADLE_ENTERPRISE_ACCESS_KEY: ((gradle_enterprise_secret_access_key))
|
||||
GRADLE_ENTERPRISE_CACHE_USER: ((gradle_enterprise_cache_user.username))
|
||||
GRADLE_ENTERPRISE_CACHE_PASSWORD: ((gradle_enterprise_cache_user.password))
|
||||
|
@ -9,6 +9,7 @@ caches:
|
||||
- path: gradle
|
||||
- path: embedmongo
|
||||
params:
|
||||
BRANCH:
|
||||
CI: true
|
||||
GRADLE_ENTERPRISE_ACCESS_KEY:
|
||||
GRADLE_ENTERPRISE_CACHE_USERNAME:
|
||||
|
@ -27,7 +27,7 @@ void tagCiOrLocal() {
|
||||
void addGitMetadata() {
|
||||
gradleEnterprise.buildScan.background {
|
||||
def gitCommitId = execAndGetStdout('git', 'rev-parse', '--short=8', '--verify', 'HEAD')
|
||||
def gitBranchName = execAndGetStdout('git', 'rev-parse', '--abbrev-ref', 'HEAD')
|
||||
def gitBranchName = getBranch()
|
||||
def gitStatus = execAndGetStdout('git', 'status', '--porcelain')
|
||||
|
||||
if(gitCommitId) {
|
||||
@ -50,6 +50,14 @@ boolean isCi() {
|
||||
System.getenv('CI')
|
||||
}
|
||||
|
||||
String getBranch() {
|
||||
def branch = System.getenv('BRANCH')
|
||||
if (branch) {
|
||||
return branch
|
||||
}
|
||||
return execAndGetStdout('git', 'rev-parse', '--abbrev-ref', 'HEAD')
|
||||
}
|
||||
|
||||
String execAndGetStdout(String... args) {
|
||||
def stdout = new ByteArrayOutputStream()
|
||||
exec {
|
||||
|
Loading…
Reference in New Issue
Block a user