[ci] ensure (again) clean checkout in docs builds (#1544)

m3db · Apr 10, 2019 · 2422428 · 2422428
1 parent 08cbbef
commit 2422428
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/.buildkite/hooks/post-checkout b/.buildkite/hooks/post-checkout
@@ -1,5 +1,6 @@
 #!/bin/bash
 
-set -exo pipefail
+set -eo pipefail
 
-git clean -df
+echo "--- :git: cleaning checkout"
+git clean -dffx
diff --git a/.buildkite/hooks/pre-exit b/.buildkite/hooks/pre-exit
@@ -1,5 +1,6 @@
 #!/bin/bash
 
-set -exo pipefail
+set -eo pipefail
 
-git clean -df
+echo "--- :git: cleaning checkout"
+git clean -dffx
diff --git a/.buildkite/scripts/docs_push.sh b/.buildkite/scripts/docs_push.sh
@@ -40,10 +40,10 @@ else
 fi
 
 # Also build & push the operator's docs.
-git clean -df
+git clean -dffx
 git checkout -t origin/operator
+git pull
 
-rm -rf m3db.io/*
 git clone git@github.com:m3db/m3db-operator.git
 
 (
@@ -56,7 +56,9 @@ if diff -qr m3db-operator/site m3db.io; then
   exit 0
 fi
 
+rm -rf m3db.io/*
 cp -r m3db-operator/site/* m3db.io
+git clean -dffx
 git add m3db.io
 git commit -m "Operator docs update $(date)"
 git push