Skip to content

Commit

Permalink
Merge pull request #92 from PhlexUI/cirdes/move-to-sqlite-and-fly
Browse files Browse the repository at this point in the history
Add yarn files and remove package-lock.json
  • Loading branch information
cirdes authored Jul 30, 2024
2 parents dc14a12 + a53c62a commit 3e9d782
Show file tree
Hide file tree
Showing 6 changed files with 147,550 additions and 2,088 deletions.
18 changes: 0 additions & 18 deletions .github/workflows/fly-deploy.yml

This file was deleted.

16 changes: 15 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
bin/rails db:test:prepare
bin/rails test
deploy-development:
heroku-deploy:
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
needs: [lint, test]
runs-on: ubuntu-latest
Expand All @@ -83,3 +83,17 @@ jobs:
heroku_api_key: ${{secrets.HEROKU_API_KEY}}
heroku_app_name: "phlex-ui-web"
heroku_email: "[email protected]"

fly-deploy:
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
needs: [lint, test]
name: Deploy app
runs-on: ubuntu-latest
concurrency: deploy-group
steps:
- uses: actions/checkout@v4
- uses: superfly/flyctl-actions/setup-flyctl@master
- run: flyctl deploy --remote-only
env:
FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}

5 changes: 1 addition & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,4 @@

/node_modules

.env*

/.yarn/*
.yarnrc
.env*
Loading

0 comments on commit 3e9d782

Please sign in to comment.