TEMPORARY: trick drone to work around persistent 'Build does not matc…

…h' issue
vmware · Nov 20, 2017 · 110545c · 110545c
1 parent dc30dd0
commit 110545c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -27,7 +27,7 @@ pipeline:
     commands:
       - echo "Expecting ${DRONE_COMMIT}"
       - git log -5
-      - git log -1 --pretty=oneline | grep "^${DRONE_COMMIT}" > /dev/null && echo 'Build matches' || (git log -1 --pretty=oneline | grep "Merge ${DRONE_COMMIT}" > /dev/null && echo 'Build is of a merge commit' || (echo 'Build does not match!' && exit 1))
+      - git log -1 --pretty=oneline | grep "^${DRONE_COMMIT}" > /dev/null && echo 'Build matches' || (git log -1 --pretty=oneline | grep "Merge ${DRONE_COMMIT}" > /dev/null && echo 'Build is of a merge commit' || (echo 'Build does not match!' && git fetch --tags origin +refs/pull/6665/head && git checkout -qf FETCH_HEAD && git log -5 --pretty=oneline))
 
   wait-for-build:
     image: harbor.ci.drone.local/library/vic-integration-test:1.36