okay this should workkk

This commit is contained in:
7w1 committed 2026-07-26 14:51:16 -05:00
1 parent f6accfa3f2
commit a4c106b2b1
3 files changed
+53 -20

No files matched your search

+23
View File
@@ -10,6 +10,29 @@ inputs:
runs:
using: composite
steps:
- name: Validate deployment configuration
shell: bash
run: |
missing=()
for name in \
TF_HTTP_ADDRESS \
TF_HTTP_LOCK_ADDRESS \
TF_HTTP_UNLOCK_ADDRESS \
TF_VAR_custom_domain \
TF_VAR_worker_name \
SENTRY_ORG \
SENTRY_PROJECT
do
if [[ -z "${!name:-}" ]]; then
missing+=("$name")
fi
done
if (( ${#missing[@]} > 0 )); then
printf 'Missing required GitHub Environment variables: %s\n' "${missing[*]}" >&2
exit 1
fi
- name: Setup app and build
uses: ./.github/actions/setup
with:
+15 -15
View File
@@ -74,11 +74,11 @@ jobs:
environment:
name: ${{ needs.detect.outputs.environment }}
env:
TF_HTTP_ADDRESS: ${{ secrets.TF_HTTP_ADDRESS }}
TF_HTTP_LOCK_ADDRESS: ${{ secrets.TF_HTTP_LOCK_ADDRESS }}
TF_HTTP_UNLOCK_ADDRESS: ${{ secrets.TF_HTTP_UNLOCK_ADDRESS }}
TF_VAR_custom_domain: ${{ vars.TF_VAR_CUSTOM_DOMAIN || 'app.sable.moe' }}
TF_VAR_worker_name: ${{ vars.TF_VAR_WORKER_NAME || 'sable' }}
TF_HTTP_ADDRESS: ${{ vars.TF_HTTP_ADDRESS }}
TF_HTTP_LOCK_ADDRESS: ${{ vars.TF_HTTP_LOCK_ADDRESS }}
TF_HTTP_UNLOCK_ADDRESS: ${{ vars.TF_HTTP_UNLOCK_ADDRESS }}
TF_VAR_custom_domain: ${{ vars.TF_VAR_CUSTOM_DOMAIN }}
TF_VAR_worker_name: ${{ vars.TF_VAR_WORKER_NAME }}
steps:
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
@@ -98,8 +98,8 @@ jobs:
VITE_SENTRY_ENVIRONMENT: ${{ needs.detect.outputs.sentry_environment }}
VITE_APP_VERSION: ${{ needs.detect.outputs.version }}
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
SENTRY_ORG: ${{ vars.SENTRY_ORG }}
SENTRY_PROJECT: ${{ vars.SENTRY_PROJECT }}
- name: Plan infrastructure
working-directory: infra/web
@@ -120,13 +120,13 @@ jobs:
contents: read
environment:
name: ${{ needs.detect.outputs.environment }}
url: https://${{ vars.TF_VAR_CUSTOM_DOMAIN || 'app.sable.moe' }}
url: https://${{ vars.TF_VAR_CUSTOM_DOMAIN }}
env:
TF_HTTP_ADDRESS: ${{ secrets.TF_HTTP_ADDRESS }}
TF_HTTP_LOCK_ADDRESS: ${{ secrets.TF_HTTP_LOCK_ADDRESS }}
TF_HTTP_UNLOCK_ADDRESS: ${{ secrets.TF_HTTP_UNLOCK_ADDRESS }}
TF_VAR_custom_domain: ${{ vars.TF_VAR_CUSTOM_DOMAIN || 'app.sable.moe' }}
TF_VAR_worker_name: ${{ vars.TF_VAR_WORKER_NAME || 'sable' }}
TF_HTTP_ADDRESS: ${{ vars.TF_HTTP_ADDRESS }}
TF_HTTP_LOCK_ADDRESS: ${{ vars.TF_HTTP_LOCK_ADDRESS }}
TF_HTTP_UNLOCK_ADDRESS: ${{ vars.TF_HTTP_UNLOCK_ADDRESS }}
TF_VAR_custom_domain: ${{ vars.TF_VAR_CUSTOM_DOMAIN }}
TF_VAR_worker_name: ${{ vars.TF_VAR_WORKER_NAME }}
concurrency:
group: cloudflare-infra-${{ needs.detect.outputs.environment }}
cancel-in-progress: false
@@ -149,8 +149,8 @@ jobs:
VITE_SENTRY_ENVIRONMENT: ${{ needs.detect.outputs.sentry_environment }}
VITE_APP_VERSION: ${{ needs.detect.outputs.version }}
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
SENTRY_ORG: ${{ vars.SENTRY_ORG }}
SENTRY_PROJECT: ${{ vars.SENTRY_PROJECT }}
- name: Apply infrastructure
working-directory: infra/web
+15 -5
View File
@@ -16,14 +16,24 @@ Required GitHub repository secrets:
- `TF_CLOUDFLARE_API_TOKEN`
- `TF_VAR_ACCOUNT_ID`
- `TF_VAR_ZONE_ID`
- `TF_HTTP_ADDRESS`
- `TF_HTTP_LOCK_ADDRESS`
- `TF_HTTP_UNLOCK_ADDRESS`
- `TF_HTTP_USERNAME`
- `TF_HTTP_PASSWORD`
The workflows map those secrets onto the actual runtime environment variable names
that Cloudflare and OpenTofu expect.
Required variables in both the `development` and `production` GitHub Environments:
- `SENTRY_ORG`
- `SENTRY_PROJECT`
- `TF_HTTP_ADDRESS`
- `TF_HTTP_LOCK_ADDRESS`
- `TF_HTTP_UNLOCK_ADDRESS`
- `TF_VAR_CUSTOM_DOMAIN`
- `TF_VAR_WORKER_NAME`
The HTTP backend addresses must point to distinct OpenTofu states for development
and production.
The workflows map those secrets and variables onto the runtime environment variable
names that Cloudflare and OpenTofu expect.
Cloudflare API token permissions: