From e1d797b08a3923e3bb67219cb6f218f0a79c4f05 Mon Sep 17 00:00:00 2001 From: Marigold Date: Sat, 7 Oct 2023 11:33:02 +0200 Subject: [PATCH] wip --- ops/buildkite/build-code | 8 ++++---- ops/buildkite/deploy-content | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ops/buildkite/build-code b/ops/buildkite/build-code index bc34a9efe27..dba27590b1d 100755 --- 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 index 053833d4ada..dca48170c39 100755 --- a/ops/buildkite/deploy-content +++ b/ops/buildkite/deploy-content @@ -9,6 +9,10 @@ set -o errexit set -o pipefail set -o nounset +echo $LIGHTNING_GDOC_SLUGS + +exit 1; + # Cloudflare Pages project name PROJECT_NAME=owid-grapher