Skip to content

Commit

Permalink
Remove wasp (#75)
Browse files Browse the repository at this point in the history
* Delete wasp directory and retain wasp shema prisma

* Add commands in devcontainer setup to run wasp prisma schema commands

* Remove wasp unit test from CI and update wasp prisma schema generate commands

* Add wasp migrations

* Remove wasp migrations

* Remove wasp app directory completely

* Rearrange running wasp prisma command in CI
  • Loading branch information
kumaranvpl authored Aug 26, 2024
1 parent 2f2a85e commit 1561a34
Show file tree
Hide file tree
Showing 198 changed files with 8 additions and 32,712 deletions.
8 changes: 4 additions & 4 deletions .devcontainer/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ pip install -e ".[dev]"
# install pre-commit hook if not installed already
pre-commit install

# install wasp
curl -sSL https://get.wasp-lang.dev/installer.sh | sh -s -- -v 0.14.0

cd app && wasp db migrate-dev && cd ..
# run wasp prisma commands
prisma db push --schema=wasp_schema.prisma
prisma generate --schema=wasp_schema.prisma --generator=client

# run python prisma commands
prisma migrate deploy --schema=schema.prisma
prisma generate --schema=schema.prisma --generator=pyclient
32 changes: 0 additions & 32 deletions .github/workflows/pipeline.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -192,37 +192,6 @@ jobs:
token: ${{ secrets.CODECOV_TOKEN }}
slug: airtai/fastagency

unit-test-wasp:
if: github.ref != 'refs/heads/dev' && github.ref != 'refs/heads/main' && github.event.pull_request.draft == false
runs-on: ubuntu-22.04
permissions:
contents: read
packages: write
steps:
- name: Checkout repository with cached git lfs
uses: nschloe/action-cached-lfs-checkout@v1
- uses: actions/setup-node@v4
with:
node-version: 20

- name: Install wasp
run: curl -sSL https://get.wasp-lang.dev/installer.sh | sh -s -- -v 0.14.0

- name: Temporary wasp fix
run: |
PATCH_FILE_PATH=$(cat $(whereis wasp | cut -d " " -f 2) | tail -1 | cut -d " " -f 1 | cut -d "=" -f 2)/Generator/templates/server/package.json
echo $PATCH_FILE_PATH
sed -i 's/"postinstall": "patch-package"/"postinstall": ""/' $PATCH_FILE_PATH
- name: Run client tests
run: cd app && wasp test client run --silent

- name: Build wasp
run: cd app && wasp build

- name: Build frontend
run: cd app && cd .wasp/build/web-app && npm install && REACT_APP_API_URL=$REACT_APP_API_URL npm run build

pre-commit-check:
runs-on: ubuntu-latest
env:
Expand Down Expand Up @@ -252,7 +221,6 @@ jobs:
- coverage-combine
- test-macos-latest
- test-windows-latest
- unit-test-wasp

runs-on: ubuntu-latest

Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -106,16 +106,14 @@ jobs:
- uses: actions/setup-node@v4
with:
node-version: 20
- name: Install wasp
run: curl -sSL https://get.wasp-lang.dev/installer.sh | sh -s -- -v 0.14.0
- name: Run wasp migration
run: cd app && wasp db migrate-dev && cd ..
- name: Install Dependencies
if: steps.cache.outputs.cache-hit != 'true'
run: pip install .[docs,testing]
- name: Install Pydantic v2
run: pip install --pre "pydantic>=2,<3"
- run: mkdir coverage
- name: Run wasp prisma commands
run: prisma db push --schema=wasp_schema.prisma && prisma generate --schema=wasp_schema.prisma
- name: Prisma
run: prisma migrate deploy && prisma generate
- name: Test without LLMs
Expand Down
2 changes: 0 additions & 2 deletions app/.gitattributes

This file was deleted.

14 changes: 0 additions & 14 deletions app/.gitignore

This file was deleted.

9 changes: 0 additions & 9 deletions app/.prettierrc

This file was deleted.

3 changes: 0 additions & 3 deletions app/.waspignore

This file was deleted.

1 change: 0 additions & 1 deletion app/.wasproot

This file was deleted.

Loading

0 comments on commit 1561a34

Please sign in to comment.