wip

owid · Oct 7, 2023 · 6a0f743 · 6a0f743
1 parent 7c384bc
commit 6a0f743
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/ops/buildkite/build-code b/ops/buildkite/build-code
@@ -24,8 +24,8 @@ HOSTNAME=$(hostname | tr -d '\r')
 build_code () {
     echo "--- Build code from branch master"
 
-    # TODO: uncomment this to avoid deploys from non-master branch
-    # if [[ "$BUILDKITE_BRANCH" != "master" ]]; then
+    # TODO: uncomment this before merging to avoid deploys from non-master branch
+    # if [[ "$BRANCH" != "master" ]]; then
     #     echo "Error: You're not on the master branch. Exiting."
     #     exit 1
     # fi
@@ -55,8 +55,8 @@ update_owid_grapher_repo() {
     (
         cd owid-grapher
         git fetch --all -q
-        git checkout "$BUILDKITE_BRANCH" -q
-        git reset --hard origin/"$BUILDKITE_BRANCH"
+        git checkout "$BRANCH" -q
+        git reset --hard origin/"$BRANCH"
     )
 }
 

diff --git a/ops/buildkite/deploy-content b/ops/buildkite/deploy-content
@@ -9,6 +9,7 @@ set -o errexit
 set -o pipefail
 set -o nounset
 
+
 # Cloudflare Pages project name
 PROJECT_NAME=owid-grapher