Skip to content

Commit

Permalink
Add yarn files and remove package-lock.json
Browse files Browse the repository at this point in the history
This PR includes the following changes:
- Removed Fly.io deployment workflow (`.github/workflows/fly-deploy.yml`)
- Updated main GitHub Actions workflow ([`.github/workflows/main.yml`](command:_github.copilot.openRelativePath?%5B%7B%22scheme%22%3A%22file%22%2C%22authority%22%3A%22%22%2C%22path%22%3A%22%2Fworkspaces%2FPhlexUI-web%2F.github%2Fworkflows%2Fmain.yml%22%2C%22query%22%3A%22%22%2C%22fragment%22%3A%22%22%7D%5D "/workspaces/PhlexUI-web/.github/workflows/main.yml"))
- Updated [`.gitignore`](command:_github.copilot.openRelativePath?%5B%7B%22scheme%22%3A%22file%22%2C%22authority%22%3A%22%22%2C%22path%22%3A%22%2Fworkspaces%2FPhlexUI-web%2F.gitignore%22%2C%22query%22%3A%22%22%2C%22fragment%22%3A%22%22%7D%5D "/workspaces/PhlexUI-web/.gitignore") to reflect new changes
- Added Yarn release file ([`.yarn/releases/yarn-1.22.19.cjs`](command:_github.copilot.openRelativePath?%5B%7B%22scheme%22%3A%22file%22%2C%22authority%22%3A%22%22%2C%22path%22%3A%22%2Fworkspaces%2FPhlexUI-web%2F.yarn%2Freleases%2Fyarn-1.22.19.cjs%22%2C%22query%22%3A%22%22%2C%22fragment%22%3A%22%22%7D%5D "/workspaces/PhlexUI-web/.yarn/releases/yarn-1.22.19.cjs"))
- Added Yarn configuration file ([`.yarnrc`](command:_github.copilot.openRelativePath?%5B%7B%22scheme%22%3A%22file%22%2C%22authority%22%3A%22%22%2C%22path%22%3A%22%2Fworkspaces%2FPhlexUI-web%2F.yarnrc%22%2C%22query%22%3A%22%22%2C%22fragment%22%3A%22%22%7D%5D "/workspaces/PhlexUI-web/.yarnrc"))
- Removed `package-lock.json` to switch to Yarn

These changes are part of the migration to SQLite and Fly.io for deployment.
  • Loading branch information
cirdes committed Jul 30, 2024
1 parent 30e4644 commit a53c62a
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 a53c62a

Please sign in to comment.