From b038378cc3100733aa042ddb4ea3e80e9a62f0b3 Mon Sep 17 00:00:00 2001 From: Zane Selvans Date: Fri, 22 Dec 2023 11:32:00 -0500 Subject: [PATCH] Update docker/gcp_pudl_etl.sh Co-authored-by: Dazhong Xia --- docker/gcp_pudl_etl.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docker/gcp_pudl_etl.sh b/docker/gcp_pudl_etl.sh index a5ea49b63b..c35edb3853 100644 --- a/docker/gcp_pudl_etl.sh +++ b/docker/gcp_pudl_etl.sh @@ -105,9 +105,8 @@ function update_nightly_branch() { git config user.name "pudlbot" git remote set-url origin "https://pudlbot:$PUDL_BOT_PAT@github.com/catalyst-cooperative/pudl.git" echo "WTAF: Updating nightly branch to point at $NIGHTLY_TAG." + git fetch origin nightly:nightly git checkout nightly - git branch --set-upstream-to=origin/nightly - git pull git merge --ff-only "$NIGHTLY_TAG" ETL_SUCCESS=${PIPESTATUS[0]} git push