Skip to content

Commit

Permalink
Merge branch 'main' of github.com:districtr/districtr-v2 into enhance…
Browse files Browse the repository at this point in the history
…d-shattering-rebase
  • Loading branch information
raphaellaude committed Oct 24, 2024
2 parents c7c7aa9 + 7a0b4aa commit 125525f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/fly-deploy-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jobs:
echo "::set-output name=name::${{ github.event.repository.name }}-${{ github.event.number }}-db"
# manually launch and deploy the api app
- name: launch api app
- name: Launch API
if: github.event.action != 'closed'
run: |
app="${{ github.event.repository.name }}-${{ github.event.number }}-api"
Expand All @@ -94,7 +94,7 @@ jobs:
echo "api_app_name=$app" >> $GITHUB_ENV
working-directory: backend

- name: deploy api app
- name: Deploy API
if: github.event.action != 'closed'
run: |
flyctl secrets set \
Expand Down Expand Up @@ -138,7 +138,7 @@ jobs:
echo "frontend_app_name=$app" >> $GITHUB_ENV
working-directory: app

- name: Deploy Frontend App
- name: Deploy frontend
if: github.event.action != 'closed'
run: |
app_name="${{ github.event.repository.name }}-${{ github.event.number }}-app"
Expand Down
4 changes: 2 additions & 2 deletions app/fly.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ primary_region = 'ewr'
[http_service]
internal_port = 3000
force_https = true
auto_stop_machines = true
auto_stop_machines = "stop"
auto_start_machines = true
min_machines_running = 1
min_machines_running = 0
processes = ['app']

[[vm]]
Expand Down
4 changes: 2 additions & 2 deletions backend/fly.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ primary_region = 'ewr'
[http_service]
internal_port = 8080
force_https = true
auto_stop_machines = true
auto_stop_machines = "stop"
auto_start_machines = true
min_machines_running = 1
min_machines_running = 0
processes = ['app']

[[vm]]
Expand Down

0 comments on commit 125525f

Please sign in to comment.