I prefer to use hub [1] to checkout a PR:

hub pr checkout <pr#id> <local-branch-name>
git rebase upstream/master
git push -f

[1]: https://github.com/github/hub


On Fri, Jul 5, 2019 at 10:22 AM Sutou Kouhei <k...@clear-code.com> wrote:

> We did this by hand in the past releases.
>
> It may be better that we have a script to do this.
>
> In <cak7z5t9m40ook-d6zp-edfrfjbzat2ng5o1zllgkpqgv+oj...@mail.gmail.com>
>   "Re: [RESULT][VOTE] Release Apache Arrow 0.14.0 - RC0" on Fri, 5 Jul
> 2019 01:16:42 -0700,
>   Micah Kornfield <emkornfi...@gmail.com> wrote:
>
> > Thanks.  Is there a script to do this or is it typically just done by
> hand?
> >
> > On Fri, Jul 5, 2019 at 1:12 AM Sutou Kouhei <k...@clear-code.com> wrote:
> >
> >> Hi Micah,
> >>
> >> Thanks for helping this.
> >>
> >> Sorry for my bad description of the task.
> >>
> >> > e.g. run:
> >> >
> >> > "./dev/release/post-00-rebase.sh apache-arrow-0.14.0-rc0"?
> >>
> >> I've already done this:
> >>
> >> >>> Done:
> >> >>>
> >> >>>   * Rebasing the master branch on local release branch
> >> >>>
> >>
> https://cwiki.apache.org/confluence/display/ARROW/Release+Management+Guide#ReleaseManagementGuide-Rebasingthemasterbranchonlocalreleasebranch
> >>
> >> I want to say that we need to rebase all open pull requests
> >> onto master. For example,
> >> https://github.com/apache/arrow/pull/4739 is needed to be
> >> rebased:
> >>
> >>   git clone --checkout decimal_benchmark g...@github.com:
> >> emkornfielda/arrow.git
> >>   cd arrow
> >>   git remote add upstream g...@github.com:apache/arrow.git
> >>   git fetch --all --prune --tags --force
> >>   git rebase upstream/master
> >>   git push --force
> >>
> >>
> >> Thanks,
> >> --
> >> kou
> >>
> >> In <cak7z5t96vuwqjv4vhj2ijicpyexuqpjsgopcsgxprm4msi8...@mail.gmail.com>
> >>   "Re: [RESULT][VOTE] Release Apache Arrow 0.14.0 - RC0" on Fri, 5 Jul
> >> 2019 01:01:18 -0700,
> >>   Micah Kornfield <emkornfi...@gmail.com> wrote:
> >>
> >> > Actually, can someone clarify is the correct approach here to clone
> the
> >> > @Kou's repo and use his RC0 branch to do the rebase?
> >> >
> >> > e.g. run:
> >> >
> >> > "./dev/release/post-00-rebase.sh apache-arrow-0.14.0-rc0"?
> >> >
> >> >
> >> > Thanks,
> >> >
> >> > Micah
> >> >
> >> > On Fri, Jul 5, 2019 at 12:38 AM Micah Kornfield <
> emkornfi...@gmail.com>
> >> > wrote:
> >> >
> >> >> * All pull requests need to rebase on master by
> >> >>>     "Rebasing the master branch on local release branch"
> >> >>
> >> >> Since it doesn't look like its been claimed i'll do it.
> >> >>
> >> >> On Thu, Jul 4, 2019 at 12:46 AM Sutou Kouhei <k...@clear-code.com>
> >> wrote:
> >> >>
> >> >>> Hi,
> >> >>>
> >> >>> I need your help!
> >> >>> Could Rust developers see "Failed:" section?
> >> >>> Could someone take over tasks in "Need helped:" section?
> >> >>>
> >> >>> Failed:
> >> >>>
> >> >>>   * Updating Rust packages
> >> >>>
> >> >>>
> >>
> https://cwiki.apache.org/confluence/display/ARROW/Release+Management+Guide#ReleaseManagementGuide-UpdatingRustpackages
> >> >>>
> >> >>>     * We need the following patch:
> >> >>>
> >> >>> ----
> >> >>> diff --git a/dev/release/post-07-rust.sh
> b/dev/release/post-07-rust.sh
> >> >>> index a2f6e2988..c632fa793 100755
> >> >>> --- a/dev/release/post-07-rust.sh
> >> >>> +++ b/dev/release/post-07-rust.sh
> >> >>> @@ -53,6 +53,12 @@ curl \
> >> >>>  rm -rf ${archive_name}
> >> >>>  tar xf ${tar_gz}
> >> >>>  modules=()
> >> >>> +  sed \
> >> >>> +    -i \
> >> >>> +    -E \
> >> >>> +    -e 's/^arrow = "([^"]*)"/arrow = { version = "\1", path =
> >> >>> "..\/arrow" }/g' \
> >> >>> +    -e 's/^parquet = "([^"]*)"/parquet = { version = "\1", path =
> >> >>> "..\/parquet" }/g' \
> >> >>> +    ${archive_name}/rust/*/Cargo.toml
> >> >>>  for cargo_toml in ${archive_name}/rust/*/Cargo.toml; do
> >> >>>    module_dir=$(dirname ${cargo_toml})
> >> >>>    pushd ${module_dir}
> >> >>> ----
> >> >>>
> >> >>>     * "INSTALL_RUST=yes dev/release/post-07-rust.sh 0.14.0"
> >> >>>       is failed with the above patch:
> >> >>>
> >> >>> ----
> >> >>>    Packaging arrow v0.14.0
> >> >>> (/home/kou/work/cpp/arrow.kou/apache-arrow-0.14.0/rust/arrow)
> >> >>>    Verifying arrow v0.14.0
> >> >>> (/home/kou/work/cpp/arrow.kou/apache-arrow-0.14.0/rust/arrow)
> >> >>> error: failed to verify package tarball
> >> >>>
> >> >>> Caused by:
> >> >>>   failed to parse manifest at
> >> >>>
> >>
> `/home/kou/work/cpp/arrow.kou/apache-arrow-0.14.0/rust/target/package/arrow-0.14.0/Cargo.toml`
> >> >>>
> >> >>> Caused by:
> >> >>>   can't find `array_from_vec` bench, specify bench.path
> >> >>> ----
> >> >>>
> >> >>>     * How to solve this?
> >> >>>
> >> >>> Done:
> >> >>>
> >> >>>   * Rebasing the master branch on local release branch
> >> >>>
> >> >>>
> >>
> https://cwiki.apache.org/confluence/display/ARROW/Release+Management+Guide#ReleaseManagementGuide-Rebasingthemasterbranchonlocalreleasebranch
> >> >>>
> >> >>>   * Marking the released version as "RELEASED" on JIRA
> >> >>>
> >> >>>
> >>
> https://cwiki.apache.org/confluence/display/ARROW/Release+Management+Guide#ReleaseManagementGuide-Markingthereleasedversionas%22RELEASED%22onJIRA
> >> >>>
> >> >>>   * Starting the new version on JIRA
> >> >>>
> >> >>>
> >>
> https://cwiki.apache.org/confluence/display/ARROW/Release+Management+Guide#ReleaseManagementGuide-StartingthenewversiononJIRA
> >> >>>
> >> >>>   * Partially: Updating the Arrow website
> >> >>>
> >> >>>
> >>
> https://cwiki.apache.org/confluence/display/ARROW/Release+Management+Guide#ReleaseManagementGuide-UpdatingtheArrowwebsite
> >> >>>
> >> >>>     * Release note has been added.
> >> >>>     * No blog post.
> >> >>>     * Not upload to website yet.
> >> >>>
> >> >>>   * Uploading source release artifacts to SVN
> >> >>>
> >> >>>
> >>
> https://cwiki.apache.org/confluence/display/ARROW/Release+Management+Guide#ReleaseManagementGuide-UploadingsourcereleaseartifactstoSVN
> >> >>>
> >> >>>   * Uploading binary release artifacts to Bintray
> >> >>>
> >> >>>
> >>
> https://cwiki.apache.org/confluence/display/ARROW/Release+Management+Guide#ReleaseManagementGuide-UploadingbinaryreleaseartifactstoBintray
> >> >>>
> >> >>>   * Partially: Announcing release
> >> >>>
> >> >>>
> >>
> https://cwiki.apache.org/confluence/display/ARROW/Release+Management+Guide#ReleaseManagementGuide-Announcingrelease
> >> >>>
> >> >>>     * Added release date.
> >> >>>     * Not send release announce to announce@ and dev@ yet.
> >> >>>
> >> >>>   * Partially: Updating C++ and Python packages
> >> >>>
> >> >>>
> >>
> https://cwiki.apache.org/confluence/display/ARROW/Release+Management+Guide#ReleaseManagementGuide-UpdatingC++andPythonpackages
> >> >>>
> >> >>>     * Uploaded to PyPI.
> >> >>>       * Wrote upload shell script but not create pull request yet.
> >> >>>     * Not update conda packages yet
> >> >>>
> >> >>>   * Updating Java Maven artifacts in Maven central
> >> >>>
> >> >>>
> >>
> https://cwiki.apache.org/confluence/display/ARROW/Release+Management+Guide#ReleaseManagementGuide-UpdatingJavaMavenartifactsinMavencentral
> >> >>>
> >> >>>   * Updating Ruby packages
> >> >>>
> >> >>>
> >>
> https://cwiki.apache.org/confluence/display/ARROW/Release+Management+Guide#ReleaseManagementGuide-UpdatingRubypackages
> >> >>>
> >> >>>   * Updating JavaScript packages
> >> >>>
> >> >>>
> >>
> https://cwiki.apache.org/confluence/display/ARROW/Release+Management+Guide#ReleaseManagementGuide-UpdatingJavaScriptpackages
> >> >>>
> >> >>>   * Updating .NET NuGet packages
> >> >>>
> >> >>>
> >>
> https://cwiki.apache.org/confluence/display/ARROW/Release+Management+Guide#ReleaseManagementGuide-Updating.NETNuGetpackages
> >> >>>
> >> >>>   * Removing source artifacts for RC
> >> >>>
> >> >>>
> >>
> https://cwiki.apache.org/confluence/display/ARROW/Release+Management+Guide#ReleaseManagementGuide-RemovingsourceartifactsforRC
> >> >>>
> >> >>> Need help:
> >> >>>
> >> >>>   * All pull requests need to rebase on master by
> >> >>>     "Rebasing the master branch on local release branch"
> >> >>>
> >> >>>   * Blog post
> >> >>>
> >> >>>   * Update website
> >> >>>
> >> >>>   * Announcing release to announce@ and dev@
> >> >>>
> >> >>>
> >>
> https://cwiki.apache.org/confluence/display/ARROW/Release+Management+Guide#ReleaseManagementGuide-Announcingrelease
> >> >>>
> >> >>>   * Updating website with new API documentation
> >> >>>
> >> >>>
> >>
> https://cwiki.apache.org/confluence/display/ARROW/Release+Management+Guide#ReleaseManagementGuide-UpdatingwebsitewithnewAPIdocumentation
> >> >>>
> >> >>>   * Updating conda packages
> >> >>>
> >> >>>
> >>
> https://cwiki.apache.org/confluence/display/ARROW/Release+Management+Guide#ReleaseManagementGuide-Updatingcondapackages
> >> >>>
> >> >>>   * Updating Homebrew packages
> >> >>>
> >> >>>
> >>
> https://cwiki.apache.org/confluence/display/ARROW/Release+Management+Guide#ReleaseManagementGuide-UpdatingHomebrewpackages
> >> >>>     * We need to add Flight support
> >> >>>     * We need to remove -D*_HOME and use system libraries as
> >> >>>       much as possible
> >> >>>
> >> >>>   * Updating R packages
> >> >>>
> >> >>>
> >>
> https://cwiki.apache.org/confluence/display/ARROW/Release+Management+Guide#ReleaseManagementGuide-UpdatingRpackages
> >> >>>
> >> >>>
> >> >>> Thanks,
> >> >>> --
> >> >>> kou
> >> >>>
> >> >>> In <20190704.144905.283036284214137033....@clear-code.com>
> >> >>>   "[RESULT][VOTE] Release Apache Arrow 0.14.0 - RC0" on Thu, 04 Jul
> >> 2019
> >> >>> 14:49:05 +0900 (JST),
> >> >>>   Sutou Kouhei <k...@clear-code.com> wrote:
> >> >>>
> >> >>> > Hi,
> >> >>> >
> >> >>> > The 0.14.0 RC0 vote carries with 4 binding +1 votes. Thanks
> >> >>> > for helping verify the RC.
> >> >>> >
> >> >>> > There are some post release tasks:
> >> >>> >
> >> >>> >
> >> >>>
> >>
> https://cwiki.apache.org/confluence/display/ARROW/Release+Management+Guide#ReleaseManagementGuide-Post-releasetasks
> >> >>> >
> >> >>> > I'll rebase the master branch. Could someone help doing
> >> >>> > these tasks?
> >> >>> >
> >> >>> >
> >> >>> > Thanks,
> >> >>> > --
> >> >>> > kou
> >> >>>
> >> >>
> >>
>

Reply via email to