From 483a1c52dd5d08c7af47e15a9e4cb9a968ba6078 Mon Sep 17 00:00:00 2001
From: multipleof4 <planetrenox@protonmail.com>
Date: Thu, 11 Sep 2025 03:00:53 -0700
Subject: [PATCH] Update deploy.yml

---
 .github/workflows/deploy.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 2532023..9a7b733 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -11,14 +11,13 @@ jobs:
     runs-on: ubuntu-latest
     env:
       FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
-      GITEA_APP_NAME: ${{ vars.GITEA_APP_NAME }}
+      GITEA_APP_NAME: ${{ vars.FLY_APP_NAME }}
       RUNNER_APP_NAME: ${{ vars.RUNNER_APP_NAME }}
       GITEA_RUNNER_REGISTRATION_TOKEN: ${{ secrets.GITEA_RUNNER_REGISTRATION_TOKEN }}
     steps:
       - uses: actions/checkout@v4
       - uses: superfly/flyctl-actions/setup-flyctl@master
       - if: github.event.inputs.app == 'gitea'
-        run: flyctl apps create "${GITEA_APP_NAME:?GITEA_APP_NAME var not set}" --org personal || true; flyctl volumes create gitea_data --size 1 --region lax -a "${GITEA_APP_NAME:?}" --yes || true; flyctl secrets set -a "${GITEA_APP_NAME:?}" --stage "GITEA__server__DOMAIN=${GITEA_APP_NAME}.fly.dev" "GITEA__server__ROOT_URL=https://${GITEA_APP_NAME}.fly.dev"; flyctl deploy --remote-only -c fly.toml -a "${GITEA_APP_NAME:?}"
+        run: flyctl apps create "${GITEA_APP_NAME:?FLY_APP_NAME var not set}" --org personal || true; flyctl volumes create gitea_data --size 1 --region lax -a "$GITEA_APP_NAME" --yes || true; flyctl secrets set -a "$GITEA_APP_NAME" --stage "GITEA__server__DOMAIN=${GITEA_APP_NAME}.fly.dev" "GITEA__server__ROOT_URL=https://${GITEA_APP_NAME}.fly.dev"; flyctl deploy --remote-only -c fly.toml -a "$GITEA_APP_NAME"
       - if: github.event.inputs.app == 'runner'
-        run: flyctl apps create "${RUNNER_APP_NAME:?RUNNER_APP_NAME var not set}" --org personal || true; flyctl volumes create runner_data --size 1 --region lax -a "${RUNNER_APP_NAME:?}" --yes || true; flyctl secrets set -a "${RUNNER_APP_NAME:?}" --stage "GITEA_INSTANCE_URL=https://${GITEA_APP_NAME:?GITEA_APP_NAME var required}" "GITEA_RUNNER_REGISTRATION_TOKEN=${GITEA_RUNNER_REGISTRATION_TOKEN:?GITEA_RUNNER_REGISTRATION_TOKEN secret not set}"; flyctl deploy --remote-only -c runner/fly.toml -a "${RUNNER_APP_NAME:?}"
-
+        run: flyctl apps create "${RUNNER_APP_NAME:?RUNNER_APP_NAME var not set}" --org personal || true; flyctl volumes create runner_data --size 1 --region lax -a "$RUNNER_APP_NAME" --yes || true; flyctl secrets set -a "$RUNNER_APP_NAME" --stage "GITEA_INSTANCE_URL=https://${GITEA_APP_NAME:?FLY_APP_NAME var not set}" "GITEA_RUNNER_REGISTRATION_TOKEN=${GITEA_RUNNER_REGISTRATION_TOKEN:?GITEA_RUNNER_REGISTRATION_TOKEN secret not set}"; flyctl deploy --remote-only -c runner/fly.toml -a "$RUNNER_APP_NAME"