Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow BUILDKITE_BRANCH to provide branch name #46053

Merged
merged 2 commits into from
Jul 15, 2022
Merged

Allow BUILDKITE_BRANCH to provide branch name #46053

merged 2 commits into from
Jul 15, 2022

Conversation

staticfloat
Copy link
Sponsor Member

Our CI system checks commits out as a detached head, which breaks our
Base.GIT_VERSION_INFO.branch information.

@staticfloat
Allow BUILDKITE_BRANCH to provide branch name
7f93a99 
Our CI system checks commits out as a detached head, which breaks our
`Base.GIT_VERSION_INFO.branch` information.
@DilumAluthge
Copy link
Member

I would first check for BUILDKITE_TAG, and then check BUILDKITE_BRANCH, and then fall back to calling git.

@DilumAluthge
Copy link
Member

Needs backport to 1.8?

@staticfloat
Copy link
Sponsor Member Author

I would first check for BUILDKITE_TAG, and then check BUILDKITE_BRANCH, and then fall back to calling git.

We record the branch name independently from whether it's tagged or not. The git describe --tags --exact-match call should always work, so I think what is here should be sufficient.

@staticfloat staticfloat added backport 1.6 Change should be backported to release-1.6 backport 1.7 backport 1.8 Change should be backported to release-1.8 labels Jul 15, 2022
DilumAluthge
DilumAluthge approved these changes Jul 15, 2022
View reviewed changes
Copy link
Member

@DilumAluthge DilumAluthge left a comment

Choose a reason for hiding this comment

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

It would be nice to have a check that checks if branch is equal to the string HEAD, and if it is, echo a warning to stderr.

But that's not strictly necessary.

@staticfloat staticfloat merged commit d117975 into master Jul 15, 2022
@staticfloat staticfloat deleted the sf/buildkite_branch_name branch July 15, 2022 20:43
KristofferC pushed a commit that referenced this pull request Jul 17, 2022
@staticfloat @KristofferC
Allow BUILDKITE_BRANCH to provide branch name (#46053)
78ad6ff 
* Allow `BUILDKITE_BRANCH` to provide branch name

Our CI system checks commits out as a detached head, which breaks our
`Base.GIT_VERSION_INFO.branch` information.

* Fix typo

(cherry picked from commit d117975)
@KristofferC KristofferC mentioned this pull request Jul 17, 2022
Merged
32 tasks
KristofferC pushed a commit that referenced this pull request Jul 20, 2022
@staticfloat
Allow BUILDKITE_BRANCH to provide branch name (#46053)
1d93a4a 
* Allow `BUILDKITE_BRANCH` to provide branch name

Our CI system checks commits out as a detached head, which breaks our
`Base.GIT_VERSION_INFO.branch` information.

* Fix typo

(cherry picked from commit d117975)
@KristofferC KristofferC mentioned this pull request Jul 20, 2022
Open
78 tasks
@KristofferC KristofferC removed the backport 1.8 Change should be backported to release-1.8 label Aug 7, 2022
ffucci pushed a commit to ffucci/julia that referenced this pull request Aug 11, 2022
@staticfloat
Allow BUILDKITE_BRANCH to provide branch name (JuliaLang#46053)
eeb23d3 
* Allow `BUILDKITE_BRANCH` to provide branch name

Our CI system checks commits out as a detached head, which breaks our
`Base.GIT_VERSION_INFO.branch` information.

* Fix typo
pcjentsch pushed a commit to pcjentsch/julia that referenced this pull request Aug 18, 2022
@staticfloat @pcjentsch
Allow BUILDKITE_BRANCH to provide branch name (JuliaLang#46053)
49591bc 
* Allow `BUILDKITE_BRANCH` to provide branch name

Our CI system checks commits out as a detached head, which breaks our
`Base.GIT_VERSION_INFO.branch` information.

* Fix typo
KristofferC pushed a commit that referenced this pull request Dec 21, 2022
@staticfloat
Allow BUILDKITE_BRANCH to provide branch name (#46053)
a1a8d2b 
* Allow `BUILDKITE_BRANCH` to provide branch name

Our CI system checks commits out as a detached head, which breaks our
`Base.GIT_VERSION_INFO.branch` information.

* Fix typo

(cherry picked from commit d117975)
KristofferC pushed a commit that referenced this pull request Dec 21, 2022
@staticfloat
Allow BUILDKITE_BRANCH to provide branch name (#46053)
b0c25bd 
* Allow `BUILDKITE_BRANCH` to provide branch name

Our CI system checks commits out as a detached head, which breaks our
`Base.GIT_VERSION_INFO.branch` information.

* Fix typo

(cherry picked from commit d117975)
staticfloat added a commit that referenced this pull request Dec 23, 2022
@staticfloat
Allow BUILDKITE_BRANCH to provide branch name (#46053)
ba61fb0 
* Allow `BUILDKITE_BRANCH` to provide branch name

Our CI system checks commits out as a detached head, which breaks our
`Base.GIT_VERSION_INFO.branch` information.

* Fix typo

(cherry picked from commit d117975)
KristofferC pushed a commit that referenced this pull request Oct 10, 2023
@staticfloat @KristofferC
Allow BUILDKITE_BRANCH to provide branch name (#46053)
1fa0450 
* Allow `BUILDKITE_BRANCH` to provide branch name

Our CI system checks commits out as a detached head, which breaks our
`Base.GIT_VERSION_INFO.branch` information.

* Fix typo

(cherry picked from commit d117975)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DilumAluthge DilumAluthge DilumAluthge approved these changes

Assignees
No one assigned
Labels
backport 1.6 Change should be backported to release-1.6
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@staticfloat @DilumAluthge @KristofferC