| |
@@ -35,11 +35,11 @@
|
| |
# If this branch is atop the master, use its tests (possibly updated).
|
| |
# Otherwise, check out origin/master for the latest tests.
|
| |
set +e
|
| |
- git merge-base --is-ancestor -- origin/master HEAD
|
| |
+ git merge-base --is-ancestor -- origin/main HEAD
|
| |
ret=$?
|
| |
set -e
|
| |
if [ $ret -ne 0 ]; then
|
| |
- git checkout origin/master
|
| |
+ git checkout origin/main
|
| |
fi
|
| |
|
| |
# Run any tests that only apply to PRs
|
| |
@@ -52,7 +52,7 @@
|
| |
# Otherwise, check out origin/master for the latest tests.
|
| |
TEMPDIR=
|
| |
set +e
|
| |
- git merge-base --is-ancestor -- origin/master HEAD
|
| |
+ git merge-base --is-ancestor -- origin/main HEAD
|
| |
ret=$?
|
| |
set -e
|
| |
if [ $ret -ne 0 ]; then
|
| |
Signed-off-by: Tomas Hrcka thrcka@redhat.com