From fd87cd3eb69e2c119f291e0d65a54b28834b2b78 Mon Sep 17 00:00:00 2001 From: Eli Fine Date: Mon, 30 Mar 2026 17:09:00 +0000 Subject: [PATCH 1/5] comment --- template/.github/workflows/ci.yaml.jinja | 1 + 1 file changed, 1 insertion(+) diff --git a/template/.github/workflows/ci.yaml.jinja b/template/.github/workflows/ci.yaml.jinja index 78ec69b..863a660 100644 --- a/template/.github/workflows/ci.yaml.jinja +++ b/template/.github/workflows/ci.yaml.jinja @@ -99,6 +99,7 @@ jobs: PULUMI_UP: false PULUMI_UP_ROLE_NAME: InfraDeploy--{% endraw %}{{ repo_name }}{% raw %} AWS_ACCOUNT_ID: "{% endraw %}{{ aws_staging_account_id }}{% raw %}" + SHOW_PREVIEW_COMMENT_ON_PR: ${{ github.event_name == 'pull_request' }} DOWNLOAD_ARTIFACT_NAME: app-frontend-static-assets DOWNLOAD_ARTIFACT_PATH: {% endraw %}{{ app_name }}{% raw %}_app/.output/public/{% endraw %}{% endif %}{% raw %} From 2878c95de68ca551c8538c6d90db7a1558b2d772 Mon Sep 17 00:00:00 2001 From: Eli Fine Date: Mon, 30 Mar 2026 17:18:21 +0000 Subject: [PATCH 2/5] deploy staging --- template/.github/workflows/ci.yaml.jinja | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/template/.github/workflows/ci.yaml.jinja b/template/.github/workflows/ci.yaml.jinja index 863a660..ad6ae7d 100644 --- a/template/.github/workflows/ci.yaml.jinja +++ b/template/.github/workflows/ci.yaml.jinja @@ -77,7 +77,7 @@ jobs: path: {% endraw %}{{ app_name }}{% raw %}_app/.output/public/**/* if-no-files-found: error -{% endraw %}{% if use_staging_environment %}{% raw %} plan-to-staging: +{% endraw %}{% if use_staging_environment %}{% raw %} pulumi-staging: uses: ./.github/workflows/pulumi-aws.yml permissions: contents: write # needed for mutex @@ -96,7 +96,7 @@ jobs: DEPLOY_SCRIPT_NAME: pulumi_deploy PULUMI_PREVIEW: true PREVIEW_ROLE_NAME: InfraPreview--{% endraw %}{{ repo_name }}{% raw %} - PULUMI_UP: false + PULUMI_UP: ${{ github.ref == 'refs/heads/main' }} PULUMI_UP_ROLE_NAME: InfraDeploy--{% endraw %}{{ repo_name }}{% raw %} AWS_ACCOUNT_ID: "{% endraw %}{{ aws_staging_account_id }}{% raw %}" SHOW_PREVIEW_COMMENT_ON_PR: ${{ github.event_name == 'pull_request' }} @@ -138,8 +138,8 @@ jobs: timeout-minutes: {% endraw %}{{ gha_short_timeout_minutes }}{% raw %} needs: - get-values - - lint{% endraw %}{% if use_staging_environment %}{% raw %} - - plan-to-staging{% endraw %}{% endif %}{% raw %} + - lint{% endraw %}{% if use_pulumi-staging_environment %}{% raw %} + - staging{% endraw %}{% endif %}{% raw %} - build-app-frontend - pulumi-prod - check-skip-duplicate @@ -156,7 +156,7 @@ jobs: [[ ! "${{ needs.check-skip-duplicate.result }}" =~ $success_pattern ]] || [[ ! "${{ needs.lint.result }}" =~ $success_pattern ]] || [[ ! "${{ needs.build-app-frontend.result }}" =~ $success_pattern ]] ||{% endraw %}{% if use_staging_environment %}{% raw %} - [[ ! "${{ needs.plan-to-staging.result }}" =~ $success_pattern ]] ||{% endraw %}{% endif %}{% raw %} + [[ ! "${{ needs.pulumi-staging.result }}" =~ $success_pattern ]] ||{% endraw %}{% endif %}{% raw %} [[ ! "${{ needs.pulumi-prod.result }}" =~ $success_pattern ]] || [[ ! "${{ needs.confirm-on-tagged-copier-template.result }}" =~ $success_pattern ]]; then echo "❌ One or more jobs did not finish with skipped or success" From c1d88f9bb405539dbe8c2788469f75a3679af88e Mon Sep 17 00:00:00 2001 From: Eli Fine Date: Mon, 30 Mar 2026 17:19:08 +0000 Subject: [PATCH 3/5] deploy staging --- template/.github/workflows/ci.yaml.jinja | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/template/.github/workflows/ci.yaml.jinja b/template/.github/workflows/ci.yaml.jinja index ad6ae7d..5a4b7b9 100644 --- a/template/.github/workflows/ci.yaml.jinja +++ b/template/.github/workflows/ci.yaml.jinja @@ -108,7 +108,8 @@ jobs: uses: ./.github/workflows/pulumi-aws.yml needs: - build-app-frontend - - check-skip-duplicate + - check-skip-duplicate{% endraw %}{% if use_staging_environment %}{% raw %} + - pulumi-staging{% endraw %}{% endif %}{% raw %} if: needs.check-skip-duplicate.outputs.should-run == 'true' && (github.event_name == 'pull_request' || github.event_name == 'merge_group' || github.ref == 'refs/heads/main') permissions: id-token: write # needed to assume OIDC roles (e.g. for downloading from CodeArtifact) From 6e6829fcf57142a217453de05df5e9a4a28c6da0 Mon Sep 17 00:00:00 2001 From: Eli Fine Date: Mon, 30 Mar 2026 17:19:51 +0000 Subject: [PATCH 4/5] fix --- template/.github/workflows/ci.yaml.jinja | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/.github/workflows/ci.yaml.jinja b/template/.github/workflows/ci.yaml.jinja index 5a4b7b9..8966337 100644 --- a/template/.github/workflows/ci.yaml.jinja +++ b/template/.github/workflows/ci.yaml.jinja @@ -140,7 +140,7 @@ jobs: needs: - get-values - lint{% endraw %}{% if use_pulumi-staging_environment %}{% raw %} - - staging{% endraw %}{% endif %}{% raw %} + - pulumi-staging{% endraw %}{% endif %}{% raw %} - build-app-frontend - pulumi-prod - check-skip-duplicate From 813e7044ef46a572a4d1c882f39ae5218b07a26d Mon Sep 17 00:00:00 2001 From: Eli Fine Date: Mon, 30 Mar 2026 17:20:28 +0000 Subject: [PATCH 5/5] more fix --- template/.github/workflows/ci.yaml.jinja | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/.github/workflows/ci.yaml.jinja b/template/.github/workflows/ci.yaml.jinja index 8966337..1eb2a0e 100644 --- a/template/.github/workflows/ci.yaml.jinja +++ b/template/.github/workflows/ci.yaml.jinja @@ -139,7 +139,7 @@ jobs: timeout-minutes: {% endraw %}{{ gha_short_timeout_minutes }}{% raw %} needs: - get-values - - lint{% endraw %}{% if use_pulumi-staging_environment %}{% raw %} + - lint{% endraw %}{% if use_staging_environment %}{% raw %} - pulumi-staging{% endraw %}{% endif %}{% raw %} - build-app-frontend - pulumi-prod