From a1918ea37a92d86897bd7cad496d4eb1ef964ce7 Mon Sep 17 00:00:00 2001 From: abrulic1 Date: Fri, 19 Sep 2025 15:16:53 +0200 Subject: [PATCH 1/3] small fix --- .github/workflows/branch-preview.yml | 29 ++++++++++++++++++++++++++++ .github/workflows/pr-close.yml | 2 +- fly.toml | 2 +- 3 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/branch-preview.yml diff --git a/.github/workflows/branch-preview.yml b/.github/workflows/branch-preview.yml new file mode 100644 index 0000000..15d8653 --- /dev/null +++ b/.github/workflows/branch-preview.yml @@ -0,0 +1,29 @@ +name: 🤖 Branch Preview + +concurrency: + group: ${{ github.repository }}-${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +on: + push: + branches: [main] + +jobs: + deploy: + name: 🚀 Deploy Branch Preview + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: forge-42/fly-deploy@v1.0.0-rc.2 + id: deploy + env: + FLY_ORG: ${{ vars.FLY_ORG }} + FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }} + FLY_REGION: ${{ vars.FLY_REGION }} + with: + app_name: ${{ env.FLY_ORG }}-${{ github.ref_name }} + env_vars: | + APP_ENV=staging + GITHUB_OWNER=${{github.repository_owner}} + GITHUB_REPO=${{github.event.repository.name}} + GITHUB_REPO_URL=https://github.com/${{ github.repository }} diff --git a/.github/workflows/pr-close.yml b/.github/workflows/pr-close.yml index 1f8f72a..addf9d7 100644 --- a/.github/workflows/pr-close.yml +++ b/.github/workflows/pr-close.yml @@ -24,4 +24,4 @@ jobs: FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }} FLY_ORG: ${{ vars.FLY_ORG }} with: - app_name: ${{ env.FLY_ORG }}-${{ github.event.number }} + app_name: ${{ env.FLY_ORG }}-${{ github.ref_name }} diff --git a/fly.toml b/fly.toml index c9c5d15..1780e86 100644 --- a/fly.toml +++ b/fly.toml @@ -1,4 +1,4 @@ -# fly.toml app configuration file generated for docs-template-test on 2025-09-12T12:27:12+02:00 +# fly.toml app configuration file generated for docs-template-test on 2025-09-19T15:08:49+02:00 # # See https://fly.io/docs/reference/configuration/ for information about how to use this file. # From 26d8454e5448fed96e85ba669de827edad55f5b5 Mon Sep 17 00:00:00 2001 From: abrulic1 Date: Fri, 19 Sep 2025 16:01:39 +0200 Subject: [PATCH 2/3] fix in app_name in workflows --- .github/workflows/branch-preview.yml | 2 +- .github/workflows/pr-close.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/branch-preview.yml b/.github/workflows/branch-preview.yml index 15d8653..fb225fe 100644 --- a/.github/workflows/branch-preview.yml +++ b/.github/workflows/branch-preview.yml @@ -21,7 +21,7 @@ jobs: FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }} FLY_REGION: ${{ vars.FLY_REGION }} with: - app_name: ${{ env.FLY_ORG }}-${{ github.ref_name }} + app_name: ${{github.event.repository.name}}-${{ github.ref_name }} env_vars: | APP_ENV=staging GITHUB_OWNER=${{github.repository_owner}} diff --git a/.github/workflows/pr-close.yml b/.github/workflows/pr-close.yml index addf9d7..04650ec 100644 --- a/.github/workflows/pr-close.yml +++ b/.github/workflows/pr-close.yml @@ -24,4 +24,4 @@ jobs: FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }} FLY_ORG: ${{ vars.FLY_ORG }} with: - app_name: ${{ env.FLY_ORG }}-${{ github.ref_name }} + ${{github.event.repository.name}}-${{ github.event.number }} From 4f2fc3bf3f0909c1c75bea2fee9a7397c4e5b5c7 Mon Sep 17 00:00:00 2001 From: abrulic1 Date: Fri, 19 Sep 2025 16:04:52 +0200 Subject: [PATCH 3/3] add missing app_name --- .github/workflows/pr-close.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-close.yml b/.github/workflows/pr-close.yml index 04650ec..f7c7221 100644 --- a/.github/workflows/pr-close.yml +++ b/.github/workflows/pr-close.yml @@ -24,4 +24,4 @@ jobs: FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }} FLY_ORG: ${{ vars.FLY_ORG }} with: - ${{github.event.repository.name}}-${{ github.event.number }} + app_name: ${{github.event.repository.name}}-${{ github.event.number }}