#217 Change master to main in runtest
Merged 3 years ago by mohanboddu. Opened 3 years ago by humaton.
releng/ humaton/fedora-module-defaults master_to_main  into  main

file modified
+3 -3
@@ -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

rebased onto 27e084a

3 years ago

Pull-Request has been merged by mohanboddu

3 years ago
Metadata