diff options
| -rw-r--r-- | doc/manual.cli | 14 | ||||
| -rw-r--r-- | mod/mod-ci-github.cxx | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/doc/manual.cli b/doc/manual.cli index ce9a698..f9af78d 100644 --- a/doc/manual.cli +++ b/doc/manual.cli @@ -783,13 +783,13 @@ changes uncompilable or otherwise buggy once merged. The second representative example is a single remote PR: someone creates a PR with a feature or bugfix from their fork of our repository. There is no corresponding branch push for this PR's head commit in our repository so it -sounds like there is only one place (the PR) where the CI result of the head -commit (@@ Shouldn't this be `merge commit`?) will be reported in our repository and so the head sharing should not -be an issue, right? While it's true that \i{spatial} sharing, that is between -BP and/or several PRs, is not an issue in this case, \i{temporal} sharing -still is. Specifically, if the base branch moves before we examine the PR, we -again may end up merging it based on the CI results that are not -representative of the merge commit. +sounds like there is only one place (the PR) where the CI result, if +associated with this head commit, will be reported in our repository and so +the head sharing should not be an issue, right? While it's true that +\i{spatial} sharing, that is between BP and/or several PRs, is not an issue in +this case, \i{temporal} sharing still is. Specifically, if the base branch +moves before we examine the PR, we again may end up merging it based on the CI +results that are not representative of the merge commit. Hopefully you see the underlying theme by now: the only way to ensure correctness in the GitHub CI model is to make sure the PR's head and merge diff --git a/mod/mod-ci-github.cxx b/mod/mod-ci-github.cxx index 30f7a53..e7dd7b5 100644 --- a/mod/mod-ci-github.cxx +++ b/mod/mod-ci-github.cxx @@ -809,8 +809,8 @@ namespace brep } else { - // Create the CI tenant. - + // Create the CI tenant by reusing the pre-check service data. + // sd.pre_check = false; // Set the service data's check_sha if this is a remote PR. The test |