diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2022-07-05 17:24:35 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2022-07-07 23:52:08 -0400 |
| commit | 092fe4d00191987d1e393a7079c6fd0c84c037a4 (patch) | |
| tree | 099d95a94ff8160d26e131f7580588ed66519d1d | |
| parent | 7d71e70e78603ec21ab334ad1156bf2cb135507a (diff) | |
ci: Monkeypatching
This merges in patches from the ci-monkeypatch branch before running
tests - right now we're using this for 9p fixes and a patch for
debugging failures to mount the root fs.
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
| -rw-r--r-- | ci/_test-git-branch.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ci/_test-git-branch.sh b/ci/_test-git-branch.sh index da423f7..d4efd3e 100644 --- a/ci/_test-git-branch.sh +++ b/ci/_test-git-branch.sh @@ -52,7 +52,10 @@ while true; do sync_git_repos git_fetch linux $COMMIT - git checkout $COMMIT + git checkout FETCH_HEAD + + git_fetch linux ci-monkeypatch + git merge --no-edit FETCH_HEAD mkdir -p ktest-out rm -rf ktest-out/out |