Merge pull request #936 from Hakuyume/fix-stable-check

Fix stable check
chainer · Nov 12, 2019 · b9355fa · b9355fa
2 parents 04b28a8 + 68896dc
commit b9355fa
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.pfnci/common.sh b/.pfnci/common.sh
@@ -13,8 +13,8 @@ TEMP=$(mktemp -d)
 mount -t tmpfs tmpfs ${TEMP}/ -o size=100%
 
 get_local_version() {
-    git merge-base --is-ancestor v6 HEAD && LOCAL_VERSION=stable 
-    git merge-base --is-ancestor master HEAD && LOCAL_VERSION=master
+    git merge-base --is-ancestor origin/v6 HEAD && LOCAL_VERSION=stable || true
+    git merge-base --is-ancestor master HEAD && LOCAL_VERSION=master || true
 }
 
 REPOSITORY=${REPOSITORY:-chainercv}