Set up CI about copse HOT 5 CLOSED

On the issue of automating PRs for upstream changes, I'm not sure how this can best be done. I opened a couple of questions on StackExchange sites:

• GitHub subtree merge requests
• Resuming merge conflict resolution in a remote repository

Neither have (as yet) received an answer.

Under the Pull Request Refs heading (in chapter 6.3 "GitHub - Maintaining a Project"), the Pro Git book states:

There’s also a refs/pull/#/merge ref on the GitHub side, which represents the commit that would result if you push the “merge” button on the site.

It would be perfect if one could manipulate this ref to reflect the subtree merge... will investigate.

from copse.

As an aside, since b9c0735 the process for pulling in upstream changes now looks something like this:

splitsh-lite \
    --path=$RUST_REPO \
    --origin=origin/master \
    --prefix=library/alloc/src/collections/btree:collections/btree \
    --prefix=library/alloc/src/testing:testing \
    --target=refs/splits/liballoc/btree

git subtree --prefix=src/liballoc pull $RUST_REPO splits/liballoc/btree

(I'm using splitsh-lite because it maintains a cache rather than having to restart from scratch on every git subtree split—but they should produce the same result).

from copse.

Unfortunately experimentation with the /refs/pull branch (in #7) was not as successful as hoped: (as suspected) it is read-only on the server and therefore we cannot manipulate it as desired. A PR that requests to merge the imported subtree commit will however automatically be closed if a merge-commit is pushed, and such can be created in a local repo as follows:

git merge -Xsubtree=src/liballoc $REMOTE/refs/pull/#/head

This is good enough.

from copse.

Automated opening of PRs for upstream commits has been added in 5630744.

Leaving issue open as further CI still required for testing, branch protection etc.

from copse.

Testing and branch protection added via ba9226c.

from copse.