Skip to content

Commit

Permalink
Merging with upstream
Browse files Browse the repository at this point in the history
  • Loading branch information
markcowl committed Jan 27, 2024
2 parents a6111f8 + 976e838 commit 1fc55bd
Show file tree
Hide file tree
Showing 4 changed files with 2,195 additions and 439 deletions.
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -184,16 +184,16 @@ each individual repo as you would any other.
### Run tests same as the ci:
```bash
rush e2e-tests
pnpm e2e-tests
```

### Test with local cadl-ranch repo

```bash
rush e2e-tests --local-cadl-ranch=<path> # where path is the absolute path to your local cadl-ranch repo.
pnpm e2e-tests --local-cadl-ranch=<path> # where path is the absolute path to your local cadl-ranch repo.
# Example
rush e2e-tests --local-cadl-ranch=/Users/some/dev/cadl-ranch
pnpm e2e-tests --local-cadl-ranch=/Users/some/dev/cadl-ranch
```

## Publishing
Expand All @@ -207,7 +207,7 @@ Do the following to publish a new release:
2. Make sure your working copy is clean and you are up-to-date and on the
main branch.

3. Run `rush prepare-publish` to stage the publishing changes.
3. Run `pnpm prepare-publish` to stage the publishing changes.

If it works you'll get a message like this:

Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,16 @@
"watch": "tsc --build ./tsconfig.ws.json --watch"
},
"devDependencies": {
"@changesets/cli": "^2.26.2",
"@changesets/cli": "^2.27.1",
"@pnpm/find-workspace-packages": "^6.0.9",
"c8": "^8.0.1",
"cspell": "^6.31.1",
"prettier-plugin-organize-imports": "~3.2.4",
"cspell": "^6.31.3",
"prettier": "~3.1.1",
"rimraf": "~5.0.1",
"prettier-plugin-organize-imports": "~3.2.4",
"rimraf": "~5.0.5",
"syncpack": "^11.2.1",
"typescript": "~5.3.3",
"vitest": "^1.1.0"
"vitest": "^1.2.2"
},
"syncpack": {
"dependencyTypes": [
Expand Down
Loading

0 comments on commit 1fc55bd

Please sign in to comment.