From 1082d0d75b083b9d98a5213d825406168dd91799 Mon Sep 17 00:00:00 2001 From: Alem Tuzlak Date: Mon, 3 Feb 2025 19:51:16 +0100 Subject: [PATCH 1/6] Test out deployments --- .github/workflows/publish.yaml | 17 ++++++++++------- .github/workflows/validate.yaml | 8 ++------ 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 17ba144..9fdfbd8 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -24,11 +24,14 @@ jobs: deploy-preview: name: "🚀 Deploy Docs" + runs-on: ubuntu-latest needs: [npm-publish] - uses: forge42dev/workflows/.github/workflows/deploy-to-fly.yaml@monorepo-matrix - with: - workspace_name: docs - set_cwd_to_workspace: true - github_environment: "docs-release" - secrets: - fly_api_token: ${{ secrets.FLY_API_TOKEN }} + steps: + - uses: forge-42/fly-deploy@main + id: deploy + env: + FLY_ORG: ${{ vars.FLY_ORG }} + FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }} + FLY_REGION: fra + with: + app_name: ${{ env.FLY_ORG }}-production diff --git a/.github/workflows/validate.yaml b/.github/workflows/validate.yaml index 095276b..2524bec 100644 --- a/.github/workflows/validate.yaml +++ b/.github/workflows/validate.yaml @@ -76,10 +76,6 @@ jobs: deploy-preview: name: "🚀 Deploy Docs" needs: [lint, typecheck, vitest] - uses: forge42dev/workflows/.github/workflows/deploy-to-fly.yaml@monorepo-matrix + uses: forge-42/fly-deploy@main with: - workspace_name: docs - set_cwd_to_workspace: true - github_environment: "docs-previev" - secrets: - fly_api_token: ${{ secrets.FLY_API_TOKEN }} + app_name: docs From b4f187c60d7c1809cd0ab54a2b993405c4461875 Mon Sep 17 00:00:00 2001 From: Alem Tuzlak Date: Mon, 3 Feb 2025 19:53:43 +0100 Subject: [PATCH 2/6] Test out deployments --- .github/workflows/validate.yaml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/.github/workflows/validate.yaml b/.github/workflows/validate.yaml index 2524bec..d3e9aa5 100644 --- a/.github/workflows/validate.yaml +++ b/.github/workflows/validate.yaml @@ -71,11 +71,16 @@ jobs: # Only works if you set `reportOnFailure: true` in your vite config as specified above # if: always() # uses: davelosert/vitest-coverage-report-action@v2 - - deploy-preview: name: "🚀 Deploy Docs" - needs: [lint, typecheck, vitest] - uses: forge-42/fly-deploy@main - with: - app_name: docs + runs-on: ubuntu-latest + needs: [lint,typecheck,vitest] + steps: + - uses: forge-42/fly-deploy@main + id: deploy + env: + FLY_ORG: ${{ vars.FLY_ORG }} + FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }} + FLY_REGION: fra + with: + app_name: ${{ env.FLY_ORG }}-production \ No newline at end of file From 61fd502a74742be6b0fa3869003e5977402df0fa Mon Sep 17 00:00:00 2001 From: Alem Tuzlak Date: Mon, 3 Feb 2025 19:55:41 +0100 Subject: [PATCH 3/6] Test out deployments --- .github/workflows/publish.yaml | 1 + .github/workflows/validate.yaml | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 9fdfbd8..a484c02 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -35,3 +35,4 @@ jobs: FLY_REGION: fra with: app_name: ${{ env.FLY_ORG }}-production + workspace_name: react-router-devtools \ No newline at end of file diff --git a/.github/workflows/validate.yaml b/.github/workflows/validate.yaml index d3e9aa5..b2c0ce3 100644 --- a/.github/workflows/validate.yaml +++ b/.github/workflows/validate.yaml @@ -83,4 +83,5 @@ jobs: FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }} FLY_REGION: fra with: - app_name: ${{ env.FLY_ORG }}-production \ No newline at end of file + app_name: ${{ env.FLY_ORG }}-production + workspace_name: react-router-devtools \ No newline at end of file From b5d452d333b732c172e86245e534a8112bedae0d Mon Sep 17 00:00:00 2001 From: Alem Tuzlak Date: Mon, 3 Feb 2025 19:58:09 +0100 Subject: [PATCH 4/6] Test out deployments --- .github/workflows/publish.yaml | 2 +- .github/workflows/validate.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index a484c02..3c45f03 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -35,4 +35,4 @@ jobs: FLY_REGION: fra with: app_name: ${{ env.FLY_ORG }}-production - workspace_name: react-router-devtools \ No newline at end of file + workspace_name: docs \ No newline at end of file diff --git a/.github/workflows/validate.yaml b/.github/workflows/validate.yaml index b2c0ce3..28edff4 100644 --- a/.github/workflows/validate.yaml +++ b/.github/workflows/validate.yaml @@ -84,4 +84,4 @@ jobs: FLY_REGION: fra with: app_name: ${{ env.FLY_ORG }}-production - workspace_name: react-router-devtools \ No newline at end of file + workspace_name: docs \ No newline at end of file From 183198866e2e6473a2fcdc4b90b801dd1cbad09d Mon Sep 17 00:00:00 2001 From: Alem Tuzlak Date: Mon, 3 Feb 2025 20:49:34 +0100 Subject: [PATCH 5/6] fix --- .github/workflows/publish.yaml | 2 +- .github/workflows/validate.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 3c45f03..2de5a9c 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -35,4 +35,4 @@ jobs: FLY_REGION: fra with: app_name: ${{ env.FLY_ORG }}-production - workspace_name: docs \ No newline at end of file + use_isolated_workspace: true \ No newline at end of file diff --git a/.github/workflows/validate.yaml b/.github/workflows/validate.yaml index 28edff4..d4d7c6c 100644 --- a/.github/workflows/validate.yaml +++ b/.github/workflows/validate.yaml @@ -84,4 +84,4 @@ jobs: FLY_REGION: fra with: app_name: ${{ env.FLY_ORG }}-production - workspace_name: docs \ No newline at end of file + use_isolated_workspace: true \ No newline at end of file From e7142c07b04056d3c164b86abd27ae2132e1b94b Mon Sep 17 00:00:00 2001 From: Alem Tuzlak Date: Mon, 3 Feb 2025 20:51:15 +0100 Subject: [PATCH 6/6] fix --- .github/workflows/publish.yaml | 3 ++- .github/workflows/validate.yaml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 2de5a9c..aa0f253 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -35,4 +35,5 @@ jobs: FLY_REGION: fra with: app_name: ${{ env.FLY_ORG }}-production - use_isolated_workspace: true \ No newline at end of file + use_isolated_workspace: true + workspace_name: docs \ No newline at end of file diff --git a/.github/workflows/validate.yaml b/.github/workflows/validate.yaml index d4d7c6c..96e11a5 100644 --- a/.github/workflows/validate.yaml +++ b/.github/workflows/validate.yaml @@ -84,4 +84,5 @@ jobs: FLY_REGION: fra with: app_name: ${{ env.FLY_ORG }}-production - use_isolated_workspace: true \ No newline at end of file + use_isolated_workspace: true + workspace_name: docs \ No newline at end of file