Skip to content

Conversation

dreis2211
Copy link
Contributor

Hi,

this is an attempt to fix #19614 by passing the Concourse branch parameter to the build scan directly and only fallback to the current mechanism if it isn't set (e.g. in local builds).

As the Concourse stuff is hard to test for me, feel free to decline the PR. Let me know what you think.

Cheers,
Christoph

@spring-projects-issues spring-projects-issues added the status: waiting-for-triage An issue we've not yet triaged label Jan 12, 2020
@philwebb philwebb added type: task A general task and removed status: waiting-for-triage An issue we've not yet triaged labels Jan 13, 2020
@philwebb philwebb added this to the 2.3.x milestone Jan 13, 2020

String getBranch() {
def branch = System.getenv('BRANCH')
if (branch != null && !branch.isEmpty()) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note for merging: I think this can be if (branch).

@wilkinsona wilkinsona added the for: merge-with-amendments Needs some changes when we merge label Jan 14, 2020
@snicoll snicoll self-assigned this Jan 16, 2020
@snicoll
Copy link
Member

snicoll commented Jan 16, 2020

I've applied those changes to CI. Merging and we can revisit if that breaks

@snicoll snicoll modified the milestones: 2.3.x, 2.3.0.M1 Jan 16, 2020
snicoll pushed a commit that referenced this pull request Jan 16, 2020
snicoll added a commit that referenced this pull request Jan 16, 2020
@snicoll snicoll closed this in e1a557e Jan 16, 2020
@dreis2211
Copy link
Contributor Author

dreis2211 commented Jan 16, 2020

Seems to work
image

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

for: merge-with-amendments Needs some changes when we merge type: task A general task

Projects

None yet

Development

Successfully merging this pull request may close these issues.

git branch captured in the build scan is wrong

5 participants