search

bgrainger / leeroy-pull-request-builder

Builds pull requests for Leeroy-based builds.
MIT License
1 stars 3 forks source link

PR should be merged then integrated #5

Closed bgrainger closed 9 years ago

bgrainger commented 9 years ago

Assume we have a Leeroy config that has:

"submodules": {
    "App": "v2.0",
    "Utility", "v2.0"
}

Consider the case of pushing a hotfix to the Utility/v1.0 branch, then opening a PR to merge that hotfix into Utility/v2.0.

When the PR is tested, the Leeroy config effectively gets updated to building App v2.0 against Utility v1.0; this build will most likely fail.

Assuming the PR can be automatically merged, we need to create a merge commit that merges UtilityFork/v1.0-hotfix into Utility/v2.0 then uses that merge commit for the build.