ARROW-15692: [Dev] Update release scripts to use default branch #12489
Conversation
… of apache/arrow.
…the msys2 repository.
… than hardcoded 'master'
homebrew repository.
…omebrew repository.
…e arrow-site repository.
|
|
lafiona
changed the title
|
@nealrichardson , I confirmed that the tests in |
Co-authored-by: Neal Richardson <neal.p.richardson@gmail.com>
kou
left a comment
kou
left a comment
There was a problem hiding this comment.
Could you also update the pull request description for the latest changes?
dev/release/post-13-msys2.sh
Outdated
| git checkout master | ||
| git rebase upstream/master | ||
| git checkout ${DEFAULT_BRANCH} | ||
| git rebase upstream/${DEFAULT_BRANCH} |
There was a problem hiding this comment.
We should not change this because the repository is a fork of msys2/MINGW-packages not apache/arrow.
There was a problem hiding this comment.
Thank you for this feedback, @kou.
I initially included the change in this file to use the default branch of the msys2/MINGW-packages repository, to make the transition smoother if they change the name of their default branch. My thought was that after the cd call on line 35, sourcing git-vars.sh would get the default branch value of the msys2/MINGW-packages repository. However, I have realized that in order for the SOURCE_DIR variable to be computed correctly, this script would need to be executed with a full path.
I will remove the change to use the git-vars.sh in this file and update the pull request description.
There was a problem hiding this comment.
I have also reverted the changes to post-04-website.sh and post-09-docs.sh, as they also reference another repository, apache/arrow-site.
There was a problem hiding this comment.
Keep the arrow-site ones in, that's another of our repos that we'll switch over to main (see also ARROW-15694)
There was a problem hiding this comment.
I've included the arrow-site related changes and updated the description. Thank you for your help, @nealrichardson !
dev/release/post-14-homebrew.sh
Outdated
| echo "Creating branch: ${branch}" | ||
| git branch -D ${branch} || : | ||
| git checkout -b ${branch} origin/master | ||
| git checkout -b ${branch} origin/${DEFAULT_BRANCH} |
There was a problem hiding this comment.
We should not change this because the repository is a fork of Homebrew/homebrew-core not apache/arrow.
There was a problem hiding this comment.
Please see the comment from the previous thread.
Co-authored-by: Sutou Kouhei <kou@cozmixng.org>
|
Benchmark runs are scheduled for baseline = 650f111 and contender = e26a88f. e26a88f is a master commit associated with this PR. Results will be available as each benchmark for each run completes. |
4 participants
Overview
This pull request is part of a larger effort to rename the default branch from
mastertomain. In order to enable a smooth transition and streamline any future renaming tasks, the default branch name ofapache/arrowis computed in the release scripts, instead of hardcoded.Implementation
git-vars.shthat computes theDEFAULT_BRANCHof a Git repository. Calculations for other required Git variables, in the future, can be added to this script.DEFAULT_BRANCH:01-prepare.shpost-12-bump-versions.shpost-04-website.shpost-09-docs.sh01-prepare.shand 'post-12-bump.share required for renaming the default branch name forapache/arrow`.arrow-siterepository, references tomasterare replaced with generic references to the default branch inpost-04-website.shandpost-09-docs.sh.Testing
ci/scripts/release_test.shpass in the CI job.Notes