Skip to content

Fix admin smoke workflow resolution #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jacobsd32-cpu merged 1 commit into from
Mar 13, 2026
Merged

Fix admin smoke workflow resolution #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 13 additions & 4 deletions .github/workflows/fly-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,13 +96,22 @@ jobs:
- run: flyctl deploy --remote-only --strategy immediate --config fly.toml --build-arg DJD_RELEASE_SHA=${GITHUB_SHA} --build-arg DJD_BUILD_TIMESTAMP=${DJD_BUILD_TIMESTAMP}
env:
FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
- name: Warn when admin smoke verification is disabled
if: ${{ secrets.DJD_ADMIN_KEY == '' && secrets.ADMIN_KEY == '' }}
run: echo "::warning::DJD_ADMIN_KEY/ADMIN_KEY secret not set; post-deploy smoke will skip admin runtime verification."
- name: Resolve admin smoke key
env:
DJD_ADMIN_KEY_PRIMARY: ${{ secrets.DJD_ADMIN_KEY }}
DJD_ADMIN_KEY_LEGACY: ${{ secrets.ADMIN_KEY }}
run: |
if [ -n "$DJD_ADMIN_KEY_PRIMARY" ]; then
echo "DJD_SMOKE_ADMIN_KEY=$DJD_ADMIN_KEY_PRIMARY" >> "$GITHUB_ENV"
elif [ -n "$DJD_ADMIN_KEY_LEGACY" ]; then
echo "DJD_SMOKE_ADMIN_KEY=$DJD_ADMIN_KEY_LEGACY" >> "$GITHUB_ENV"
else
echo "::warning::DJD_ADMIN_KEY/ADMIN_KEY secret not set; post-deploy smoke will skip admin runtime verification."
fi
- name: Post-deploy smoke check
run: node scripts/post-deploy-smoke.mjs
env:
DJD_HEALTHCHECK_URL: https://djdagentscore.dev/health
DJD_EXPECT_RUNTIME_MODE: combined
DJD_EXPECT_RELEASE_SHA: ${{ github.sha }}
DJD_ADMIN_KEY: ${{ secrets.DJD_ADMIN_KEY != '' && secrets.DJD_ADMIN_KEY || secrets.ADMIN_KEY }}
DJD_ADMIN_KEY: ${{ env.DJD_SMOKE_ADMIN_KEY }}
20 changes: 16 additions & 4 deletions .github/workflows/fly-preview.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,13 +122,25 @@ jobs:
--build-arg DJD_BUILD_TIMESTAMP="${DJD_BUILD_TIMESTAMP}"
env:
FLY_API_TOKEN: ${{ secrets.FLY_PREVIEW_API_TOKEN != '' && secrets.FLY_PREVIEW_API_TOKEN || secrets.FLY_API_TOKEN }}
- name: Warn when preview admin smoke verification is disabled
if: ${{ secrets.FLY_PREVIEW_ADMIN_KEY == '' && secrets.DJD_ADMIN_KEY == '' && secrets.ADMIN_KEY == '' }}
run: echo "::warning::FLY_PREVIEW_ADMIN_KEY/DJD_ADMIN_KEY/ADMIN_KEY secret not set; preview smoke will skip admin runtime verification."
- name: Resolve preview admin smoke key
env:
FLY_PREVIEW_ADMIN_KEY_SECRET: ${{ secrets.FLY_PREVIEW_ADMIN_KEY }}
DJD_ADMIN_KEY_PRIMARY: ${{ secrets.DJD_ADMIN_KEY }}
DJD_ADMIN_KEY_LEGACY: ${{ secrets.ADMIN_KEY }}
run: |
if [ -n "$FLY_PREVIEW_ADMIN_KEY_SECRET" ]; then
echo "DJD_SMOKE_ADMIN_KEY=$FLY_PREVIEW_ADMIN_KEY_SECRET" >> "$GITHUB_ENV"
elif [ -n "$DJD_ADMIN_KEY_PRIMARY" ]; then
echo "DJD_SMOKE_ADMIN_KEY=$DJD_ADMIN_KEY_PRIMARY" >> "$GITHUB_ENV"
elif [ -n "$DJD_ADMIN_KEY_LEGACY" ]; then
echo "DJD_SMOKE_ADMIN_KEY=$DJD_ADMIN_KEY_LEGACY" >> "$GITHUB_ENV"
else
echo "::warning::FLY_PREVIEW_ADMIN_KEY/DJD_ADMIN_KEY/ADMIN_KEY secret not set; preview smoke will skip admin runtime verification."
fi
- name: Post-deploy smoke check
run: node scripts/post-deploy-smoke.mjs
env:
DJD_HEALTHCHECK_URL: ${{ env.DJD_HEALTHCHECK_URL }}
DJD_EXPECT_RUNTIME_MODE: combined
DJD_EXPECT_RELEASE_SHA: ${{ github.sha }}
DJD_ADMIN_KEY: ${{ secrets.FLY_PREVIEW_ADMIN_KEY != '' && secrets.FLY_PREVIEW_ADMIN_KEY || (secrets.DJD_ADMIN_KEY != '' && secrets.DJD_ADMIN_KEY || secrets.ADMIN_KEY) }}
DJD_ADMIN_KEY: ${{ env.DJD_SMOKE_ADMIN_KEY }}