From 4c24f95624650ad20893823b9dda0cff389854b8 Mon Sep 17 00:00:00 2001 From: Marc Mintel Date: Wed, 11 Feb 2026 18:52:42 +0100 Subject: [PATCH] fix(deploy): fix broken yaml indentation in deploy.yml --- .gitea/workflows/deploy.yml | 104 ++++++++++++++++++------------------ 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 8082f46..2141fc9 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -5,13 +5,13 @@ on: branches: - main tags: - - 'v*' + - "v*" workflow_dispatch: inputs: skip_checks: - description: 'Skip tests? (true/false)' + description: "Skip tests? (true/false)" required: false - default: 'false' + default: "false" concurrency: group: ${{ github.workflow }}-${{ (github.ref_type == 'tag' && !contains(github.ref_name, '-')) && 'prod' || (github.ref_name == 'main' && 'testing' || github.ref_name) }} @@ -25,15 +25,15 @@ jobs: name: ๐Ÿ” Prepare runs-on: docker outputs: - target: ${{ steps.determine.outputs.target }} - image_tag: ${{ steps.determine.outputs.image_tag }} - env_file: ${{ steps.determine.outputs.env_file }} - traefik_host: ${{ steps.determine.outputs.traefik_host }} - traefik_rule: ${{ steps.determine.outputs.traefik_rule }} - next_public_url: ${{ steps.determine.outputs.next_public_url }} - directus_url: ${{ steps.determine.outputs.directus_url }} - project_name: ${{ steps.determine.outputs.project_name }} - short_sha: ${{ steps.determine.outputs.short_sha }} + target: ${{ steps.determine.outputs.target }} + image_tag: ${{ steps.determine.outputs.image_tag }} + env_file: ${{ steps.determine.outputs.env_file }} + traefik_host: ${{ steps.determine.outputs.traefik_host }} + traefik_rule: ${{ steps.determine.outputs.traefik_rule }} + next_public_url: ${{ steps.determine.outputs.next_public_url }} + directus_url: ${{ steps.determine.outputs.directus_url }} + project_name: ${{ steps.determine.outputs.project_name }} + short_sha: ${{ steps.determine.outputs.short_sha }} container: image: catthehacker/ubuntu:act-latest steps: @@ -185,51 +185,51 @@ jobs: container: image: catthehacker/ubuntu:act-latest env: - TARGET: ${{ needs.prepare.outputs.target }} - IMAGE_TAG: ${{ needs.prepare.outputs.image_tag }} - PROJECT_NAME: ${{ needs.prepare.outputs.project_name }} + TARGET: ${{ needs.prepare.outputs.target }} + IMAGE_TAG: ${{ needs.prepare.outputs.image_tag }} + PROJECT_NAME: ${{ needs.prepare.outputs.project_name }} NEXT_PUBLIC_BASE_URL: ${{ needs.prepare.outputs.next_public_url }} - DIRECTUS_URL: ${{ needs.prepare.outputs.directus_url }} - DIRECTUS_HOST: cms.${{ needs.prepare.outputs.traefik_host }} - + DIRECTUS_URL: ${{ needs.prepare.outputs.directus_url }} + DIRECTUS_HOST: cms.${{ needs.prepare.outputs.traefik_host }} + # Secrets mapping (Directus) - DIRECTUS_KEY: ${{ (needs.prepare.outputs.target == 'testing' && secrets.TESTING_DIRECTUS_KEY) || (needs.prepare.outputs.target == 'staging' && secrets.STAGING_DIRECTUS_KEY) || secrets.DIRECTUS_KEY || vars.DIRECTUS_KEY }} - DIRECTUS_SECRET: ${{ (needs.prepare.outputs.target == 'testing' && secrets.TESTING_DIRECTUS_SECRET) || (needs.prepare.outputs.target == 'staging' && secrets.STAGING_DIRECTUS_SECRET) || secrets.DIRECTUS_SECRET || vars.DIRECTUS_SECRET }} - DIRECTUS_ADMIN_EMAIL: ${{ (needs.prepare.outputs.target == 'testing' && secrets.TESTING_DIRECTUS_ADMIN_EMAIL) || (needs.prepare.outputs.target == 'staging' && secrets.STAGING_DIRECTUS_ADMIN_EMAIL) || secrets.DIRECTUS_ADMIN_EMAIL || vars.DIRECTUS_ADMIN_EMAIL || 'admin@mintel.me' }} + DIRECTUS_KEY: ${{ (needs.prepare.outputs.target == 'testing' && secrets.TESTING_DIRECTUS_KEY) || (needs.prepare.outputs.target == 'staging' && secrets.STAGING_DIRECTUS_KEY) || secrets.DIRECTUS_KEY || vars.DIRECTUS_KEY }} + DIRECTUS_SECRET: ${{ (needs.prepare.outputs.target == 'testing' && secrets.TESTING_DIRECTUS_SECRET) || (needs.prepare.outputs.target == 'staging' && secrets.STAGING_DIRECTUS_SECRET) || secrets.DIRECTUS_SECRET || vars.DIRECTUS_SECRET }} + DIRECTUS_ADMIN_EMAIL: ${{ (needs.prepare.outputs.target == 'testing' && secrets.TESTING_DIRECTUS_ADMIN_EMAIL) || (needs.prepare.outputs.target == 'staging' && secrets.STAGING_DIRECTUS_ADMIN_EMAIL) || secrets.DIRECTUS_ADMIN_EMAIL || vars.DIRECTUS_ADMIN_EMAIL || 'admin@mintel.me' }} DIRECTUS_ADMIN_PASSWORD: ${{ (needs.prepare.outputs.target == 'testing' && secrets.TESTING_DIRECTUS_ADMIN_PASSWORD) || (needs.prepare.outputs.target == 'staging' && secrets.STAGING_DIRECTUS_ADMIN_PASSWORD) || secrets.DIRECTUS_ADMIN_PASSWORD || vars.DIRECTUS_ADMIN_PASSWORD }} - DIRECTUS_DB_NAME: ${{ secrets.DIRECTUS_DB_NAME || vars.DIRECTUS_DB_NAME || 'directus' }} - DIRECTUS_DB_USER: ${{ secrets.DIRECTUS_DB_USER || vars.DIRECTUS_DB_USER || 'directus' }} - DIRECTUS_DB_PASSWORD: ${{ (needs.prepare.outputs.target == 'testing' && secrets.TESTING_DIRECTUS_DB_PASSWORD) || (needs.prepare.outputs.target == 'staging' && secrets.STAGING_DIRECTUS_DB_PASSWORD) || secrets.DIRECTUS_DB_PASSWORD || vars.DIRECTUS_DB_PASSWORD || 'directus' }} - DIRECTUS_API_TOKEN: ${{ (needs.prepare.outputs.target == 'testing' && secrets.TESTING_DIRECTUS_API_TOKEN) || (needs.prepare.outputs.target == 'staging' && secrets.STAGING_DIRECTUS_API_TOKEN) || secrets.DIRECTUS_API_TOKEN || vars.DIRECTUS_API_TOKEN }} - + DIRECTUS_DB_NAME: ${{ secrets.DIRECTUS_DB_NAME || vars.DIRECTUS_DB_NAME || 'directus' }} + DIRECTUS_DB_USER: ${{ secrets.DIRECTUS_DB_USER || vars.DIRECTUS_DB_USER || 'directus' }} + DIRECTUS_DB_PASSWORD: ${{ (needs.prepare.outputs.target == 'testing' && secrets.TESTING_DIRECTUS_DB_PASSWORD) || (needs.prepare.outputs.target == 'staging' && secrets.STAGING_DIRECTUS_DB_PASSWORD) || secrets.DIRECTUS_DB_PASSWORD || vars.DIRECTUS_DB_PASSWORD || 'directus' }} + DIRECTUS_API_TOKEN: ${{ (needs.prepare.outputs.target == 'testing' && secrets.TESTING_DIRECTUS_API_TOKEN) || (needs.prepare.outputs.target == 'staging' && secrets.STAGING_DIRECTUS_API_TOKEN) || secrets.DIRECTUS_API_TOKEN || vars.DIRECTUS_API_TOKEN }} + # Secrets mapping (Mail) - MAIL_HOST: ${{ secrets.SMTP_HOST || vars.SMTP_HOST }} - MAIL_PORT: ${{ secrets.SMTP_PORT || vars.SMTP_PORT || '587' }} - MAIL_USERNAME: ${{ secrets.SMTP_USER || vars.SMTP_USER }} - MAIL_PASSWORD: ${{ secrets.SMTP_PASS || vars.SMTP_PASS }} - MAIL_FROM: ${{ secrets.SMTP_FROM || vars.SMTP_FROM }} - MAIL_RECIPIENTS: ${{ secrets.CONTACT_RECIPIENT || vars.CONTACT_RECIPIENT }} + MAIL_HOST: ${{ secrets.SMTP_HOST || vars.SMTP_HOST }} + MAIL_PORT: ${{ secrets.SMTP_PORT || vars.SMTP_PORT || '587' }} + MAIL_USERNAME: ${{ secrets.SMTP_USER || vars.SMTP_USER }} + MAIL_PASSWORD: ${{ secrets.SMTP_PASS || vars.SMTP_PASS }} + MAIL_FROM: ${{ secrets.SMTP_FROM || vars.SMTP_FROM }} + MAIL_RECIPIENTS: ${{ secrets.CONTACT_RECIPIENT || vars.CONTACT_RECIPIENT }} # Authentication - GATEKEEPER_PASSWORD: ${{ secrets.GATEKEEPER_PASSWORD || vars.GATEKEEPER_PASSWORD }} - AUTH_COOKIE_NAME: ${{ secrets.AUTH_COOKIE_NAME || vars.AUTH_COOKIE_NAME || 'mintel_gatekeeper_session' }} - COOKIE_DOMAIN: ${{ secrets.COOKIE_DOMAIN || vars.COOKIE_DOMAIN || '.mintel.me' }} + GATEKEEPER_PASSWORD: ${{ secrets.GATEKEEPER_PASSWORD || vars.GATEKEEPER_PASSWORD }} + AUTH_COOKIE_NAME: ${{ secrets.AUTH_COOKIE_NAME || vars.AUTH_COOKIE_NAME || 'mintel_gatekeeper_session' }} + COOKIE_DOMAIN: ${{ secrets.COOKIE_DOMAIN || vars.COOKIE_DOMAIN || '.mintel.me' }} # Monitoring & Services - SENTRY_DSN: ${{ secrets.SENTRY_DSN || vars.SENTRY_DSN }} - UMAMI_WEBSITE_ID: ${{ secrets.UMAMI_WEBSITE_ID || secrets.NEXT_PUBLIC_UMAMI_WEBSITE_ID || vars.UMAMI_WEBSITE_ID || vars.NEXT_PUBLIC_UMAMI_WEBSITE_ID }} - UMAMI_API_ENDPOINT: ${{ secrets.UMAMI_API_ENDPOINT || secrets.NEXT_PUBLIC_UMAMI_SCRIPT_URL || vars.UMAMI_API_ENDPOINT || 'https://analytics.infra.mintel.me' }} - PROJECT_COLOR: ${{ secrets.PROJECT_COLOR || vars.PROJECT_COLOR || '#ff00ff' }} + SENTRY_DSN: ${{ secrets.SENTRY_DSN || vars.SENTRY_DSN }} + UMAMI_WEBSITE_ID: ${{ secrets.UMAMI_WEBSITE_ID || secrets.NEXT_PUBLIC_UMAMI_WEBSITE_ID || vars.UMAMI_WEBSITE_ID || vars.NEXT_PUBLIC_UMAMI_WEBSITE_ID }} + UMAMI_API_ENDPOINT: ${{ secrets.UMAMI_API_ENDPOINT || secrets.NEXT_PUBLIC_UMAMI_SCRIPT_URL || vars.UMAMI_API_ENDPOINT || 'https://analytics.infra.mintel.me' }} + PROJECT_COLOR: ${{ secrets.PROJECT_COLOR || vars.PROJECT_COLOR || '#ff00ff' }} steps: - name: Checkout repository uses: actions/checkout@v4 - name: ๐Ÿ“ Generate Environment shell: bash env: - TRAEFIK_RULE: ${{ needs.prepare.outputs.traefik_rule }} - TRAEFIK_HOST: ${{ needs.prepare.outputs.traefik_host }} - GATEKEEPER_HOST: gatekeeper.${{ needs.prepare.outputs.traefik_host }} - ENV_FILE: ${{ needs.prepare.outputs.env_file }} + TRAEFIK_RULE: ${{ needs.prepare.outputs.traefik_rule }} + TRAEFIK_HOST: ${{ needs.prepare.outputs.traefik_host }} + GATEKEEPER_HOST: gatekeeper.${{ needs.prepare.outputs.traefik_host }} + ENV_FILE: ${{ needs.prepare.outputs.env_file }} run: | # Generate Environment File cat > .env.deploy << EOF @@ -238,7 +238,7 @@ jobs: NEXT_PUBLIC_BASE_URL=$NEXT_PUBLIC_BASE_URL SENTRY_DSN=$SENTRY_DSN PROJECT_COLOR=$PROJECT_COLOR - + # Directus DIRECTUS_URL=$DIRECTUS_URL DIRECTUS_HOST=$DIRECTUS_HOST @@ -251,7 +251,7 @@ jobs: DIRECTUS_DB_PASSWORD=$DIRECTUS_DB_PASSWORD DIRECTUS_API_TOKEN=$DIRECTUS_API_TOKEN INTERNAL_DIRECTUS_URL=http://directus:8055 - + # Mail MAIL_HOST=$MAIL_HOST MAIL_PORT=$MAIL_PORT @@ -277,7 +277,7 @@ jobs: TRAEFIK_RULE='$TRAEFIK_RULE' TRAEFIK_HOST='$TRAEFIK_HOST' GATEKEEPER_HOST='$GATEKEEPER_HOST' -EOF + EOF # AUTH_MIDDLEWARE logic printf "AUTH_MIDDLEWARE=%s\n" "$( [[ "$TARGET" == "production" ]] && echo "compress" || echo "${PROJECT_NAME}-auth,compress" )" >> .env.deploy @@ -285,7 +285,7 @@ EOF - name: ๐Ÿš€ SSH Deploy shell: bash env: - ENV_FILE: ${{ needs.prepare.outputs.env_file }} + ENV_FILE: ${{ needs.prepare.outputs.env_file }} run: | mkdir -p ~/.ssh echo "${{ secrets.ALPHA_SSH_KEY }}" > ~/.ssh/id_ed25519 @@ -295,17 +295,17 @@ EOF # Transfer and Restart SITE_DIR="/home/deploy/sites/mintel.me" ssh root@alpha.mintel.me "mkdir -p $SITE_DIR/directus/schema $SITE_DIR/directus/uploads $SITE_DIR/directus/extensions" - + scp .env.deploy root@alpha.mintel.me:$SITE_DIR/$ENV_FILE scp docker-compose.yml root@alpha.mintel.me:$SITE_DIR/docker-compose.yml - + ssh root@alpha.mintel.me "cd $SITE_DIR && echo '${{ secrets.REGISTRY_PASS }}' | docker login registry.infra.mintel.me -u '${{ secrets.REGISTRY_USER }}' --password-stdin" ssh root@alpha.mintel.me "cd $SITE_DIR && docker compose -p '${{ needs.prepare.outputs.project_name }}' --env-file '$ENV_FILE' pull" ssh root@alpha.mintel.me "cd $SITE_DIR && docker compose -p '${{ needs.prepare.outputs.project_name }}' --env-file '$ENV_FILE' up -d --remove-orphans" - + # Apply Directus Schema Snapshot if available ssh root@alpha.mintel.me "cd $SITE_DIR && if docker compose -p '${{ needs.prepare.outputs.project_name }}' --env-file '$ENV_FILE' exec -T directus ls /directus/schema/snapshot.yaml >/dev/null 2>&1; then echo 'โ†’ Applying Directus Schema Snapshot...' && docker compose -p '${{ needs.prepare.outputs.project_name }}' --env-file '$ENV_FILE' exec -T directus npx directus schema apply /directus/schema/snapshot.yaml --yes; fi" - + ssh root@alpha.mintel.me "docker system prune -f --filter 'until=24h'" - name: ๐Ÿงน Post-Deploy Cleanup (Runner) @@ -354,7 +354,7 @@ EOF STATUS="${{ needs.deploy.result }}" TITLE="mintel.me: $STATUS" [[ "$STATUS" == "success" ]] && PRIORITY=5 || PRIORITY=8 - + curl -s -k -X POST "${{ secrets.GOTIFY_URL }}/message?token=${{ secrets.GOTIFY_TOKEN }}" \ -F "title=$TITLE" \ -F "message=Deploy to ${{ needs.prepare.outputs.target }} finished with status $STATUS.\nVersion: ${{ needs.prepare.outputs.image_tag }}" \