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.

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

Support updating non-master Julia branches (such as backports-release-1.9) #83

Merged
merged 1 commit into from
Jan 3, 2023

Conversation

DilumAluthge
Copy link
Member

Fixes #76

Comment on lines 5 to 8
BUMPSTDLIBS_TARGET_BRANCH:
description: 'Target branch (in the JuliaLang/julia) to target. Examples include master, release-1.9, etc.'
required: true
default: 'master'
Copy link
Member

Choose a reason for hiding this comment

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

I think this will also need a source branch, given that both will be on release-1.9 etc. ?

Copy link
Member

Choose a reason for hiding this comment

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

But one could be on backports-release-1.9 etc so can't use the same

Copy link
Member Author

Choose a reason for hiding this comment

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

Hmmmm. Presumably both the source and target should be backports-release-1.9?

Copy link
Member

Choose a reason for hiding this comment

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

I don't think so. backport- is internal staging for a repo, another shouldn't link to it, I believe

Copy link
Member Author

Choose a reason for hiding this comment

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

I'm not sure I follow.

Copy link
Member

Choose a reason for hiding this comment

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

So for instance for a bump request, Pkg branch could be release-1.9 and julia branch be backports-release-1.9

They will often not match when managing release branches

Copy link
Member Author

Choose a reason for hiding this comment

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

Oh, I see what you're getting at.

This branch name is only for the branch in upstream Julia.

The BumpStdlibs.jl package never takes in any input for the branch name in the stdlib repo. We always respect the stdlib branch specified as e.g. PKG_BRANCH in Pkg.version.

Copy link
Member Author

Choose a reason for hiding this comment

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

E.g. we would parse https://github.com/JuliaLang/julia/blob/backports-release-1.8/stdlib/Pkg.version and then use the release-1.8 branch of the Pkg.jl repo, because that's the value of PKG_BRANCH.

Copy link
Member Author

Choose a reason for hiding this comment

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

So the user first needs to make a PR to e.g. edit the PKG_BRANCH variable in the Pkg.version file.

This can be done entirely from the GitHub web interface; if you only edit the PKG_BRANCH line (and you don't actually change the commit hash), you don't need to change any checksums.

Copy link
Member

Choose a reason for hiding this comment

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

Ok. That seems reasonable

@DilumAluthge DilumAluthge changed the title Support updating non-master Julia branches (such as release-1.9) Support updating non-master Julia branches (such as backports-release-1.9) Jan 3, 2023
@codecov
Copy link

codecov bot commented Jan 3, 2023

Codecov Report

Merging #83 (f41038f) into master (7072c40) will increase coverage by 0.57%.
The diff coverage is 92.85%.

❗ Current head f41038f differs from pull request most recent head c209f9d. Consider uploading reports for the commit c209f9d to get more accurate results

@@            Coverage Diff             @@
##           master      #83      +/-   ##
==========================================
+ Coverage   91.11%   91.68%   +0.57%     
==========================================
  Files          11       11              
  Lines         405      397       -8     
==========================================
- Hits          369      364       -5     
+ Misses         36       33       -3     
Impacted Files Coverage Δ
src/inputs.jl 52.94% <83.33%> (+5.32%) ⬆️
src/bump-stdlibs.jl 92.65% <100.00%> (-0.17%) ⬇️
src/types.jl 100.00% <100.00%> (ø)

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@DilumAluthge
Copy link
Member Author

I think this is good to go now.

@IanButterworth Would you mind doing another review?

@DilumAluthge
Copy link
Member Author

Here's an example of the PR that needs to be made manually: JuliaLang/julia#48105

Copy link
Member

@IanButterworth IanButterworth left a comment

Choose a reason for hiding this comment

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

LGTM!

@DilumAluthge DilumAluthge merged commit 6a264cb into master Jan 3, 2023
@DilumAluthge DilumAluthge deleted the dpa/target branch January 3, 2023 20:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Feature request: Support updating non-master julia branches, like release-1.8
2 participants