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

Stop mixing prs across branches #73

Merged
merged 7 commits into from Mar 12, 2019

Conversation

Projects
None yet
4 participants
@ryandawsonuk
Copy link

ryandawsonuk commented Feb 25, 2019

Currently having trouble with pipelines so can't merge right now. http://jenkins.jx.35.240.9.95.nip.io/job/Activiti/job/activiti-build/job/7.0.x/12/console resulted in https://github.com/Activiti/Activiti/pull/2556/files , which is a mixture of the 7.0.x and 7.1.x release trains - more specifically the 7.0.x train made a commit to overwrite a PR on the 7.1.x train

That PR is https://api.github.com/repos/Activiti/Activiti/pulls/2556 - from there we can see that the base branch has a ref (develop) and updatebot needs to check the base branch ref against its yaml file for that repo before performing the update

Also happens to include changes for #69 as based on same fork

@jenkins-x-bot jenkins-x-bot requested review from pmuir and rawlingsj Feb 25, 2019

@jenkins-x-bot

This comment has been minimized.

Copy link

jenkins-x-bot commented Feb 25, 2019

Hi @ryandawsonuk. Thanks for your PR.

I'm waiting for a jenkins-x member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@ryandawsonuk ryandawsonuk reopened this Feb 25, 2019

@ryandawsonuk

This comment has been minimized.

Copy link
Author

ryandawsonuk commented Feb 25, 2019

@ryandawsonuk

This comment has been minimized.

Copy link
Author

ryandawsonuk commented Feb 25, 2019

Have now used that tester project to successfully do the following:

  1. Create a new PR to 7.0.x branch when no existing PR https://github.com/Activiti/activiti-api/pull/94/files
  2. Create new PR to 7.0.x branch Activiti/Activiti#2557 without changing existing PR to develop branch on same repo i.e. it did not update Activiti/Activiti#2556 which was open at the same time
  3. Update an existing PR to 7.0.x branch https://github.com/Activiti/activiti-dependencies/pull/125/files

@ryandawsonuk ryandawsonuk changed the title Work in progress: Stop mixing prs across branches Stop mixing prs across branches Feb 25, 2019

@igdianov

This comment has been minimized.

Copy link

igdianov commented Feb 25, 2019

@ryandawsonuk I added fix to include base branch ref in PR title in order to distinguish between single PRs using different base branch configurations.

@igdianov

This comment has been minimized.

Copy link

igdianov commented Feb 26, 2019

Here is the screenshot of two single PRs in https://github.com/Activiti/Activiti/pulls for each branch:

develop branch:

image

7.0.x branch:

image

@jstrachan

This comment has been minimized.

Copy link
Member

jstrachan commented Mar 11, 2019

/ok-to-test

@jstrachan

This comment has been minimized.

Copy link
Member

jstrachan commented Mar 12, 2019

/lgtm

@jenkins-x-bot

This comment has been minimized.

Copy link

jenkins-x-bot commented Mar 12, 2019

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jstrachan

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@jenkins-x-bot jenkins-x-bot merged commit c8a13fc into jenkins-x:master Mar 12, 2019

2 checks passed

serverless-jenkins succeeded
tide In merge pool.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session.