Skip to content

Commit 191d887

Browse files
committed
Revert trigger promotion
1 parent c1a3500 commit 191d887

File tree

2 files changed

+15
-39
lines changed

2 files changed

+15
-39
lines changed

.github/workflows/ci.yml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ jobs:
1616
uses: ./.github/workflows/test-build.yml
1717
secrets: inherit
1818

19+
<<<<<<< HEAD
1920
# Deploy Trigger.dev FIRST (right after test-build, before images)
2021
trigger-deploy:
2122
name: Deploy Trigger.dev
@@ -27,10 +28,12 @@ jobs:
2728
id-token: write
2829
contents: read
2930

31+
=======
32+
>>>>>>> 27b05ad97 (Revert trigger promotion)
3033
# Build AMD64 images and push to ECR immediately (+ GHCR for main)
3134
build-amd64:
3235
name: Build AMD64
33-
needs: trigger-deploy
36+
needs: test-build
3437
if: github.event_name == 'push' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/staging')
3538
runs-on: blacksmith-4vcpu-ubuntu-2404
3639
permissions:
@@ -122,7 +125,7 @@ jobs:
122125
# Build ARM64 images for GHCR (main branch only, runs in parallel)
123126
build-ghcr-arm64:
124127
name: Build ARM64 (GHCR Only)
125-
needs: trigger-deploy
128+
needs: test-build
126129
runs-on: linux-arm64-8-core
127130
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
128131
permissions:
@@ -170,6 +173,14 @@ jobs:
170173
provenance: false
171174
sbom: false
172175

176+
# Deploy Trigger.dev (after ECR images are pushed)
177+
trigger-deploy:
178+
name: Deploy Trigger.dev
179+
needs: build-amd64
180+
if: github.event_name == 'push' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/staging')
181+
uses: ./.github/workflows/trigger-deploy.yml
182+
secrets: inherit
183+
173184
# Create GHCR multi-arch manifests (only for main, after both builds)
174185
create-ghcr-manifests:
175186
name: Create GHCR Manifests

.github/workflows/trigger-deploy.yml

Lines changed: 2 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ jobs:
1313
cancel-in-progress: false
1414
env:
1515
TRIGGER_ACCESS_TOKEN: ${{ secrets.TRIGGER_ACCESS_TOKEN }}
16-
permissions:
17-
id-token: write
18-
contents: read
1916

2017
steps:
2118
- name: Checkout code
@@ -34,44 +31,12 @@ jobs:
3431
- name: Install dependencies
3532
run: bun install
3633

37-
- name: Configure AWS credentials
38-
uses: aws-actions/configure-aws-credentials@v4
39-
with:
40-
role-to-assume: ${{ github.ref == 'refs/heads/main' && secrets.AWS_ROLE_TO_ASSUME || secrets.STAGING_AWS_ROLE_TO_ASSUME }}
41-
aws-region: ${{ github.ref == 'refs/heads/main' && secrets.AWS_REGION || secrets.STAGING_AWS_REGION }}
42-
4334
- name: Deploy to Trigger.dev (Staging)
4435
if: github.ref == 'refs/heads/staging'
45-
id: deploy-staging
4636
working-directory: ./apps/sim
47-
env:
48-
TRIGGER_ACCESS_TOKEN: ${{ secrets.TRIGGER_ACCESS_TOKEN }}
49-
run: |
50-
npx --yes trigger.dev@4.0.4 deploy -e staging --skip-promotion
51-
52-
- name: Store Staging version in Parameter Store
53-
if: github.ref == 'refs/heads/staging'
54-
run: |
55-
aws ssm put-parameter \
56-
--name "${{ secrets.TRIGGER_VERSION_SECRET_MANAGER_STAGING }}" \
57-
--value "${{ steps.deploy-staging.outputs.deploymentVersion }}" \
58-
--type "String" \
59-
--overwrite
37+
run: npx --yes trigger.dev@4.0.4 deploy -e staging
6038

6139
- name: Deploy to Trigger.dev (Production)
6240
if: github.ref == 'refs/heads/main'
63-
id: deploy-production
6441
working-directory: ./apps/sim
65-
env:
66-
TRIGGER_ACCESS_TOKEN: ${{ secrets.TRIGGER_ACCESS_TOKEN }}
67-
run: |
68-
npx --yes trigger.dev@4.0.4 deploy --skip-promotion
69-
70-
- name: Store Production version in Parameter Store
71-
if: github.ref == 'refs/heads/main'
72-
run: |
73-
aws ssm put-parameter \
74-
--name "${{ secrets.TRIGGER_VERSION_SECRET_MANAGER_PROD }}" \
75-
--value "${{ steps.deploy-production.outputs.deploymentVersion }}" \
76-
--type "String" \
77-
--overwrite
42+
run: npx --yes trigger.dev@4.0.4 deploy

0 commit comments

Comments
 (0)