Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -273,21 +273,21 @@ jobs:
id: deploy
working-directory: ./apps/sim
env:
TRIGGER_ACCESS_TOKEN: ${{ secrets.TRIGGER_ACCESS_TOKEN }}
TRIGGER_ACCESS_TOKEN: ${{ (steps.target.outputs.environment == 'prod' && secrets.TRIGGER_ACCESS_TOKEN_PROD) || (steps.target.outputs.environment == 'staging' && secrets.TRIGGER_ACCESS_TOKEN_STAGING) || secrets.TRIGGER_ACCESS_TOKEN }}
TRIGGER_PROJECT_ID: ${{ secrets.TRIGGER_PROJECT_ID }}
TRIGGER_ENV: ${{ steps.target.outputs.environment }}
TRIGGER_BRANCH: ${{ steps.target.outputs.preview_branch }}
run: |
set -eo pipefail
if [ -z "$TRIGGER_ACCESS_TOKEN" ] || [ -z "$TRIGGER_PROJECT_ID" ]; then
echo "ERROR: TRIGGER_ACCESS_TOKEN and TRIGGER_PROJECT_ID repo secrets must both be set" >&2
echo "ERROR: TRIGGER_PROJECT_ID and a Trigger.dev access token (TRIGGER_ACCESS_TOKEN_${TRIGGER_ENV^^} or TRIGGER_ACCESS_TOKEN) repo secrets must be set" >&2
exit 1
fi
TARGET_ARGS=(--env "$TRIGGER_ENV")
if [ -n "$TRIGGER_BRANCH" ]; then
TARGET_ARGS+=(--branch "$TRIGGER_BRANCH")
fi
bunx trigger.dev@4.5.16 deploy "${TARGET_ARGS[@]}" --skip-promotion
bunx trigger.dev@4.7.6 deploy "${TARGET_ARGS[@]}" --skip-promotion

- name: Validate deployment version output
env:
Expand Down Expand Up @@ -618,15 +618,15 @@ jobs:
- name: Promote Trigger.dev version
working-directory: ./apps/sim
env:
TRIGGER_ACCESS_TOKEN: ${{ secrets.TRIGGER_ACCESS_TOKEN }}
TRIGGER_ACCESS_TOKEN: ${{ (needs.trigger-upload.outputs.environment == 'prod' && secrets.TRIGGER_ACCESS_TOKEN_PROD) || (needs.trigger-upload.outputs.environment == 'staging' && secrets.TRIGGER_ACCESS_TOKEN_STAGING) || secrets.TRIGGER_ACCESS_TOKEN }}
TRIGGER_PROJECT_ID: ${{ secrets.TRIGGER_PROJECT_ID }}
TRIGGER_ENV: ${{ needs.trigger-upload.outputs.environment }}
TRIGGER_BRANCH: ${{ needs.trigger-upload.outputs.preview_branch }}
VERSION: ${{ needs.trigger-upload.outputs.version }}
run: |
set -eo pipefail
if [ -z "$TRIGGER_ACCESS_TOKEN" ] || [ -z "$TRIGGER_PROJECT_ID" ]; then
echo "ERROR: TRIGGER_ACCESS_TOKEN and TRIGGER_PROJECT_ID repo secrets must both be set" >&2
echo "ERROR: TRIGGER_PROJECT_ID and a Trigger.dev access token (TRIGGER_ACCESS_TOKEN_${TRIGGER_ENV^^} or TRIGGER_ACCESS_TOKEN) repo secrets must be set" >&2
exit 1
fi
if [ -z "$VERSION" ]; then
Expand All @@ -638,7 +638,7 @@ jobs:
if [ -n "$TRIGGER_BRANCH" ]; then
TARGET_ARGS+=(--branch "$TRIGGER_BRANCH")
fi
bunx trigger.dev@4.5.16 promote "$VERSION" "${TARGET_ARGS[@]}"
bunx trigger.dev@4.7.6 promote "$VERSION" "${TARGET_ARGS[@]}"

# Production only, once the new app serves traffic: submit the library and comparison URLs this
# push changed to IndexNow. Best effort: nothing depends on it, and a failure never fails the run.
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/trigger-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,19 @@ jobs:
id: deploy
working-directory: ./apps/sim
env:
TRIGGER_ACCESS_TOKEN: ${{ secrets.TRIGGER_ACCESS_TOKEN }}
TRIGGER_ACCESS_TOKEN: ${{ secrets.TRIGGER_ACCESS_TOKEN_PREVIEW || secrets.TRIGGER_ACCESS_TOKEN }}
TRIGGER_PROJECT_ID: ${{ secrets.TRIGGER_PROJECT_ID }}
run: |
set -euo pipefail
: "${TRIGGER_ACCESS_TOKEN:?TRIGGER_ACCESS_TOKEN must be configured}"
: "${TRIGGER_ACCESS_TOKEN:?TRIGGER_ACCESS_TOKEN_PREVIEW or TRIGGER_ACCESS_TOKEN must be configured}"
: "${TRIGGER_PROJECT_ID:?TRIGGER_PROJECT_ID must be configured}"
bunx trigger.dev@4.5.16 deploy --env preview --branch dev-sim --skip-promotion
bunx trigger.dev@4.7.6 deploy --env preview --branch dev-sim --skip-promotion

- name: Promote current dev preview
working-directory: ./apps/sim
env:
GH_TOKEN: ${{ github.token }}
TRIGGER_ACCESS_TOKEN: ${{ secrets.TRIGGER_ACCESS_TOKEN }}
TRIGGER_ACCESS_TOKEN: ${{ secrets.TRIGGER_ACCESS_TOKEN_PREVIEW || secrets.TRIGGER_ACCESS_TOKEN }}
TRIGGER_PROJECT_ID: ${{ secrets.TRIGGER_PROJECT_ID }}
VERSION: ${{ steps.deploy.outputs.deploymentVersion }}
run: |
Expand All @@ -61,4 +61,4 @@ jobs:
echo "::notice::Skipping superseded dev task version $VERSION"
exit 0
fi
bunx trigger.dev@4.5.16 promote "$VERSION" --env preview --branch dev-sim
bunx trigger.dev@4.7.6 promote "$VERSION" --env preview --branch dev-sim
6 changes: 3 additions & 3 deletions apps/sim/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,8 @@
"@tiptap/starter-kit": "3.31.4",
"@tiptap/suggestion": "3.31.4",
"@tiptap/y-tiptap": "3.0.7",
"@trigger.dev/core": "4.5.16",
"@trigger.dev/sdk": "4.5.16",
"@trigger.dev/core": "4.7.6",
"@trigger.dev/sdk": "4.7.6",
"@typescript/typescript6": "^6.0.2",
"@xterm/addon-fit": "0.11.0",
"@xterm/addon-unicode11": "0.9.0",
Expand Down Expand Up @@ -292,7 +292,7 @@
"@tailwindcss/postcss": "^4.3.3",
"@tailwindcss/typography": "0.5.20",
"@testing-library/jest-dom": "^6.10.0",
"@trigger.dev/build": "4.5.16",
"@trigger.dev/build": "4.7.6",
"@types/archiver": "8.0.0",
"@types/busboy": "1.5.4",
"@types/hast": "3.0.5",
Expand Down
Loading
Loading