diff options
| author | Adin Scannell <ascannell@google.com> | 2019-09-10 00:37:46 -0700 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2019-09-10 00:38:52 -0700 |
| commit | 849c57314f6b6f0d1ebcfa2e68762b8ea95f5948 (patch) | |
| tree | c346871da845a4e5d433448f5aaa6ac58e4d8856 /tools/go_branch.sh | |
| parent | 9dfcd8b09fceff830c880065db66821e53c500b0 (diff) | |
Fix minor Kokoro issues.
A recent Kokoro change pointed to go_tests.cfg (in line with the
other configurations), which unfortunately broke the presubmits.
This change also enabled the KVM tests, which were still using a
remote execution strategy.
This fixes both of these issues and allows presubmits to pass.
One additional test was caught with this case, which seems to
have been broken. It's unclear why this was not being caught.
PiperOrigin-RevId: 268166291
Diffstat (limited to 'tools/go_branch.sh')
| -rwxr-xr-x | tools/go_branch.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/go_branch.sh b/tools/go_branch.sh index d9e79401d..ddb9b6e7b 100755 --- a/tools/go_branch.sh +++ b/tools/go_branch.sh @@ -59,7 +59,11 @@ git checkout -b go "${go_branch}" # Start working on a merge commit that combines the previous history with the # current history. Note that we don't actually want any changes yet. -git merge --allow-unrelated-histories --no-commit --strategy ours ${head} +# +# N.B. The git behavior changed at some point and the relevant flag was added +# to allow for override, so try the only behavior first then pass the flag. +git merge --no-commit --strategy ours ${head} || \ + git merge --allow-unrelated-histories --no-commit --strategy ours ${head} # Sync the entire gopath_dir and go.mod. rsync --recursive --verbose --delete --exclude .git --exclude README.md -L "${gopath_dir}/" . |