From c629eac0eb7a0ba072196ebe963a7d99e0a454d9 Mon Sep 17 00:00:00 2001 From: David Date: Thu, 2 Jul 2026 22:17:16 -0400 Subject: [PATCH] ci: pin DEPLOY_USER to circleci; add DEPLOY_NOTIFIER for Slack --- .github/scripts/slackpost_deploy.sh | 2 +- .github/workflows/config.yml | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.github/scripts/slackpost_deploy.sh b/.github/scripts/slackpost_deploy.sh index b15ae9999..e95151489 100755 --- a/.github/scripts/slackpost_deploy.sh +++ b/.github/scripts/slackpost_deploy.sh @@ -21,7 +21,7 @@ if [[ $username == "" ]]; then fi # ------------ -text="New deployment! Woo! $DEPLOY_USER: $BRANCH $DEPLOY_TAG" +text="New deployment! Woo! $DEPLOY_NOTIFIER: $BRANCH $DEPLOY_TAG" escapedText=$(echo "$text" | sed 's/"/\"/g' | sed "s/'/\'/g") diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml index 3f53a3c25..cb86e2769 100644 --- a/.github/workflows/config.yml +++ b/.github/workflows/config.yml @@ -671,7 +671,13 @@ jobs: deploy: name: Deploy env: - DEPLOY_USER: ${{ github.actor }} + # DEPLOY_USER is the Terraform stack identity: it names every resource and + # selects the remote state file (see TF_VAR_user). Keep it "circleci" to + # match the existing stacks — it was hardcoded under CircleCI, and if it + # became the pushing user (github.actor) every deploy would fork a new stack. + DEPLOY_USER: circleci + # Who actually triggered the deploy; shown in the Slack notification. + DEPLOY_NOTIFIER: ${{ github.actor }} if: startsWith(github.ref, 'refs/tags/v') && ! endsWith(github.ref, '-hotfix') needs: - determine_branch @@ -743,7 +749,13 @@ jobs: deploy_hotfix: name: Deploy Hotfix env: - DEPLOY_USER: ${{ github.actor }} + # DEPLOY_USER is the Terraform stack identity: it names every resource and + # selects the remote state file (see TF_VAR_user). Keep it "circleci" to + # match the existing stacks — it was hardcoded under CircleCI, and if it + # became the pushing user (github.actor) every deploy would fork a new stack. + DEPLOY_USER: circleci + # Who actually triggered the deploy; shown in the Slack notification. + DEPLOY_NOTIFIER: ${{ github.actor }} if: startsWith(github.ref, 'refs/tags/v') && endsWith(github.ref, '-hotfix') needs: - determine_branch