From c5d725e159e5655ddc6b1b7a7baf03a34c287eca Mon Sep 17 00:00:00 2001 From: multipleof4 Date: Thu, 11 Sep 2025 02:46:34 -0700 Subject: [PATCH] Update deploy.yml --- .github/workflows/deploy.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 0b84543..bf1087a 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -11,13 +11,13 @@ jobs: runs-on: ubuntu-latest env: FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }} - GITEA_APP_NAME: ${{ secrets.FLY_APP_NAME }} - RUNNER_APP_NAME: ${{ secrets.RUNNER_APP_NAME }} + GITEA_APP_NAME: ${{ vars.GITEA_APP_NAME }} + RUNNER_APP_NAME: ${{ vars.RUNNER_APP_NAME }} steps: - uses: actions/checkout@v4 - uses: superfly/flyctl-actions/setup-flyctl@master - - if: github.event.inputs.app == 'gitea' - run: flyctl apps create ${{ env.GITEA_APP_NAME }} --org personal || true; flyctl volumes create gitea_data --size 1 -a ${{ env.GITEA_APP_NAME }} || true; flyctl secrets set -a ${{ env.GITEA_APP_NAME }} GITEA__server__DOMAIN=${{ env.GITEA_APP_NAME }}.fly.dev GITEA__server__ROOT_URL=https://${{ env.GITEA_APP_NAME }}.fly.dev; flyctl deploy --remote-only -a ${{ env.GITEA_APP_NAME }} -c fly.toml - - if: github.event.inputs.app == 'runner' - run: flyctl apps create ${{ env.RUNNER_APP_NAME }} --org personal || true; flyctl volumes create runner_data --size 1 -a ${{ env.RUNNER_APP_NAME }} || true; flyctl secrets set -a ${{ env.RUNNER_APP_NAME }} GITEA_INSTANCE_URL=https://${{ env.GITEA_APP_NAME }}.fly.dev GITEA_RUNNER_REGISTRATION_TOKEN='${{ secrets.GITEA_RUNNER_REGISTRATION_TOKEN }}'; flyctl deploy --remote-only -a ${{ env.RUNNER_APP_NAME }} -c runner/fly.toml - + - env: + GITEA_TOKEN: ${{ secrets.GITEA_RUNNER_REGISTRATION_TOKEN }} + run: | + [ "${{ github.event.inputs.app }}" = "gitea" ] && (flyctl apps create $GITEA_APP_NAME --org personal || true; flyctl volumes create gitea_data --size 1 -a $GITEA_APP_NAME || true; flyctl secrets set GITEA__server__DOMAIN=$GITEA_APP_NAME.fly.dev GITEA__server__ROOT_URL=https://$GITEA_APP_NAME.fly.dev -a $GITEA_APP_NAME; flyctl deploy --remote-only -a $GITEA_APP_NAME -c fly.toml) + [ "${{ github.event.inputs.app }}" = "runner" ] && (flyctl apps create $RUNNER_APP_NAME --org personal || true; flyctl volumes create runner_data --size 1 -a $RUNNER_APP_NAME || true; flyctl secrets set GITEA_INSTANCE_URL=https://$GITEA_APP_NAME.fly.dev "GITEA_RUNNER_REGISTRATION_TOKEN=$GITEA_TOKEN" -a $RUNNER_APP_NAME; flyctl deploy --remote-only -a $RUNNER_APP_NAME -c runner/fly.toml)