Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
240f2fb2
Commit
240f2fb2
authored
Jan 12, 2020
by
dreis2211
Committed by
Stephane Nicoll
Jan 16, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Pass CI branch parameter to build scan
See gh-19658
parent
33e414fc
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
1 deletion
+13
-1
pipeline.yml
ci/pipeline.yml
+3
-0
build-project.yml
ci/tasks/build-project.yml
+1
-0
build-scan-user-data.gradle
gradle/build-scan-user-data.gradle
+9
-1
No files found.
ci/pipeline.yml
View file @
240f2fb2
...
@@ -210,6 +210,7 @@ jobs:
...
@@ -210,6 +210,7 @@ jobs:
image
:
spring-boot-ci-image
image
:
spring-boot-ci-image
file
:
git-repo/ci/tasks/build-project.yml
file
:
git-repo/ci/tasks/build-project.yml
params
:
params
:
BRANCH
:
((branch))
GRADLE_ENTERPRISE_ACCESS_KEY
:
((gradle_enterprise_secret_access_key))
GRADLE_ENTERPRISE_ACCESS_KEY
:
((gradle_enterprise_secret_access_key))
GRADLE_ENTERPRISE_CACHE_USER
:
((gradle_enterprise_cache_user.username))
GRADLE_ENTERPRISE_CACHE_USER
:
((gradle_enterprise_cache_user.username))
GRADLE_ENTERPRISE_CACHE_PASSWORD
:
((gradle_enterprise_cache_user.password))
GRADLE_ENTERPRISE_CACHE_PASSWORD
:
((gradle_enterprise_cache_user.password))
...
@@ -299,6 +300,7 @@ jobs:
...
@@ -299,6 +300,7 @@ jobs:
image
:
spring-boot-jdk11-ci-image
image
:
spring-boot-jdk11-ci-image
file
:
git-repo/ci/tasks/build-project.yml
file
:
git-repo/ci/tasks/build-project.yml
params
:
params
:
BRANCH
:
((branch))
GRADLE_ENTERPRISE_ACCESS_KEY
:
((gradle_enterprise_secret_access_key))
GRADLE_ENTERPRISE_ACCESS_KEY
:
((gradle_enterprise_secret_access_key))
GRADLE_ENTERPRISE_CACHE_USER
:
((gradle_enterprise_cache_user.username))
GRADLE_ENTERPRISE_CACHE_USER
:
((gradle_enterprise_cache_user.username))
GRADLE_ENTERPRISE_CACHE_PASSWORD
:
((gradle_enterprise_cache_user.password))
GRADLE_ENTERPRISE_CACHE_PASSWORD
:
((gradle_enterprise_cache_user.password))
...
@@ -336,6 +338,7 @@ jobs:
...
@@ -336,6 +338,7 @@ jobs:
image
:
spring-boot-jdk13-ci-image
image
:
spring-boot-jdk13-ci-image
file
:
git-repo/ci/tasks/build-project.yml
file
:
git-repo/ci/tasks/build-project.yml
params
:
params
:
BRANCH
:
((branch))
GRADLE_ENTERPRISE_ACCESS_KEY
:
((gradle_enterprise_secret_access_key))
GRADLE_ENTERPRISE_ACCESS_KEY
:
((gradle_enterprise_secret_access_key))
GRADLE_ENTERPRISE_CACHE_USER
:
((gradle_enterprise_cache_user.username))
GRADLE_ENTERPRISE_CACHE_USER
:
((gradle_enterprise_cache_user.username))
GRADLE_ENTERPRISE_CACHE_PASSWORD
:
((gradle_enterprise_cache_user.password))
GRADLE_ENTERPRISE_CACHE_PASSWORD
:
((gradle_enterprise_cache_user.password))
...
...
ci/tasks/build-project.yml
View file @
240f2fb2
...
@@ -9,6 +9,7 @@ caches:
...
@@ -9,6 +9,7 @@ caches:
-
path
:
gradle
-
path
:
gradle
-
path
:
embedmongo
-
path
:
embedmongo
params
:
params
:
BRANCH
:
CI
:
true
CI
:
true
GRADLE_ENTERPRISE_ACCESS_KEY
:
GRADLE_ENTERPRISE_ACCESS_KEY
:
GRADLE_ENTERPRISE_CACHE_USERNAME
:
GRADLE_ENTERPRISE_CACHE_USERNAME
:
...
...
gradle/build-scan-user-data.gradle
View file @
240f2fb2
...
@@ -27,7 +27,7 @@ void tagCiOrLocal() {
...
@@ -27,7 +27,7 @@ void tagCiOrLocal() {
void
addGitMetadata
()
{
void
addGitMetadata
()
{
gradleEnterprise
.
buildScan
.
background
{
gradleEnterprise
.
buildScan
.
background
{
def
gitCommitId
=
execAndGetStdout
(
'git'
,
'rev-parse'
,
'--short=8'
,
'--verify'
,
'HEAD'
)
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'
)
def
gitStatus
=
execAndGetStdout
(
'git'
,
'status'
,
'--porcelain'
)
if
(
gitCommitId
)
{
if
(
gitCommitId
)
{
...
@@ -50,6 +50,14 @@ boolean isCi() {
...
@@ -50,6 +50,14 @@ boolean isCi() {
System
.
getenv
(
'CI'
)
System
.
getenv
(
'CI'
)
}
}
String
getBranch
()
{
def
branch
=
System
.
getenv
(
'BRANCH'
)
if
(
branch
!=
null
&&
!
branch
.
isEmpty
())
{
return
branch
}
return
execAndGetStdout
(
'git'
,
'rev-parse'
,
'--abbrev-ref'
,
'HEAD'
)
}
String
execAndGetStdout
(
String
...
args
)
{
String
execAndGetStdout
(
String
...
args
)
{
def
stdout
=
new
ByteArrayOutputStream
()
def
stdout
=
new
ByteArrayOutputStream
()
exec
{
exec
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment