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

add support for --sync-pr-with-develop #3087

Merged
merged 6 commits into from
Nov 18, 2019

Conversation

boegel
Copy link
Member

@boegel boegel commented Nov 16, 2019

With --sync-pr-with-develop, you can sync the branch (on GitHub) that corresponds to a specific pull request with the latest version of the develop branch from the central repository.

Examples:

  • syncing {bio}[GCCcore/10.20] ack v3.4.0 w/ Perl 5.32.0 easybuild-easyconfigs#7277 with develop branch from central repository (https://github.com/easybuilders/easybuild-easyconfigs):

    $ eb --sync-pr-with-develop 7277
    == temporary log file in case of crash /tmp/eb-Uul_00/easybuild-kwe1IC.log
    == Determined branch name corresponding to easybuilders/easybuild-easyconfigs PR #7277: 20181210212203_new_pr_ack224
    == cloning git repo from /user/example/easybuild-easyconfigs...
    == fetching branch '20181210212203_new_pr_ack224' from https://github.com/boegel/easybuild-easyconfigs.git...
    == pulling latest version of 'easybuilders' branch from easybuild-easyconfigs/develop...
    == merging 'develop' branch into PR branch '20181210212203_new_pr_ack224'...
    == pushing branch '20181210212203_new_pr_ack224' to remote 'github_boegel_IhzHm' (git@github.com:boegel/easybuild-easyconfigs.git)
    == Temporary log file(s) /tmp/eb-Uul_00/easybuild-kwe1IC.log* have been removed.
    == Temporary directory /tmp/eb-Uul_00 has been removed.
    

    resulting commit: easybuilders/easybuild-easyconfigs@c086627

  • dry run of syncing make bootstrap script compatible with Python 3 (WIP) #3028 with develop branch from central repository (https://github.com/easybuilders/easybuild-framework):

    $ eb --sync-pr 3028 --pr-target-repo easybuild-framework --dry-run
    == temporary log file in case of crash /tmp/eb-NLTcIF/easybuild-zDtzwv.log
    == Determined branch name corresponding to easybuilders/easybuild-framework PR #3028: bootstrap_py3
    == cloning git repo from /home/example/easybuild-framework...
    == fetching branch 'bootstrap_py3' from https://github.com/boegel/easybuild-framework.git...
    == pulling latest version of 'easybuilders' branch from easybuild-framework/develop...
    == merging 'develop' branch into PR branch 'bootstrap_py3'...
    == pushing branch 'bootstrap_py3' to remote 'github_boegel_SRxxW' (git@github.com:boegel/easybuild-framework.git) [DRY RUN]
    == Temporary log file(s) /tmp/eb-NLTcIF/easybuild-zDtzwv.log* have been removed.
    == Temporary directory /tmp/eb-NLTcIF has been removed.
    

    (same result with -D or -x instead of --dry-run)

Just using --sync-pr works too, since there's only one option that starts with --sync-pr...

@boegel boegel added this to the next release (4.1.0) milestone Nov 16, 2019
easybuild/tools/github.py Outdated Show resolved Hide resolved
easybuild/tools/github.py Outdated Show resolved Hide resolved
Copy link
Member

@migueldiascosta migueldiascosta left a comment

Choose a reason for hiding this comment

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

lgtm

@migueldiascosta
Copy link
Member

Going in, thanks @boegel!

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

Successfully merging this pull request may close these issues.

None yet

3 participants