Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions .github/workflows/e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ on:

env:
WASP_TELEMETRY_DISABLE: 1
WASP_VERSION: 0.20.0
WASP_VERSION:
# If you're copying this workflow to your own project, set this to your app's Wasp version:
main

jobs:
test:
Expand All @@ -27,9 +29,16 @@ jobs:
- name: Docker setup
uses: docker/setup-buildx-action@v3

- name: Install Wasp
- name: Install Wasp ${{ env.WASP_VERSION }}
if: env.WASP_VERSION != 'main'
run: curl -sSL https://get.wasp.sh/installer.sh | sh -s -- -v ${{ env.WASP_VERSION }}

# If you're copying this workflow to your own project, you can remove this step:
- name: Install latest development Wasp
if: env.WASP_VERSION == 'main'
# Installs the latest published build of the CLI from the `main` branch.
run: npm i -g https://pkg.pr.new/@wasp.sh/wasp-cli@main

- name: Cache global node modules
uses: actions/cache@v4
with:
Expand Down
4 changes: 4 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ Repo is divided into two main parts: [template](/template) dir and [opensaas-sh]

## How to Contribute

> [!IMPORTANT]
> The in-development version of the template uses the in-development version of Wasp. We've set up the `./tools/wasp` script.
> To use it, whenever you would normally run `wasp <command>`, run `<path-to-repo>/tools/wasp <command>` instead.

1. Make sure you understand the basics of how open-saas works (check out [docs](https://docs.opensaas.sh)).
2. Check out this repo (`main` branch) and make sure you are able to get the app in [template/app/](/template/app) running (to set it up, follow the same steps as for running a new open-saas app, as explained in the open-saas docs).
3. Create a new git branch for your work (aka feature branch) and do your changes on it.
Expand Down
4 changes: 4 additions & 0 deletions opensaas-sh/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ Inception :)!

### Demo app (app_diff/)

> [!IMPORTANT]
> The in-development version of the template uses the in-development version of Wasp. We've set up the `./tools/wasp` script.
> To use it, whenever you would normally run `wasp <command>`, run `<path-to-repo>/tools/wasp <command>` instead.

Since the demo app is just the open saas template with some small tweaks, and we want to be able to easily keep it up to date as the template changes, we don't version (in git) the actual demo app code, instead we version the diffs between it and the template: `app_diff/`.

#### Workflow
Expand Down
5 changes: 5 additions & 0 deletions tools/wasp
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we use a different name to denote it's a development version or no?
waspd -> wasp development?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mmm no strong opinion. I thought a bit and couldn't find any name that I like, so I'll stay with just wasp.

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/sh

# Just a wrapper to always use the latest Wasp CLI from main branch.

npx -y https://pkg.pr.new/@wasp.sh/wasp-cli@main "$@"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is actually a really nice addition for external contributors.