Skip to content

Commit

Permalink
Merge pull request #564 from fendor/polish/yarn-over-npm
Browse files Browse the repository at this point in the history
Upgrade dependencies
  • Loading branch information
fendor authored Apr 3, 2022
2 parents f44d6bf + 81d60d6 commit b80f636
Show file tree
Hide file tree
Showing 8 changed files with 2,398 additions and 11,701 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,21 @@ jobs:
- uses: actions/setup-node@v1
with:
node-version: 14
- run: npm ci
- run: yarn install --immutable --immutable-cache --check-cache
- name: Publish to Visual Studio Marketplace
id: publishToVSMarketplace
uses: HaaLeo/publish-vscode-extension@v0
with:
pat: ${{ secrets.VS_MARKETPLACE_TOKEN }}
registryUrl: https://marketplace.visualstudio.com
yarn: true
- name: Publish to Open VSX Registry
id: publishToOpenVSX
continue-on-error: true
uses: HaaLeo/publish-vscode-extension@v0
with:
pat: ${{ secrets.OPEN_VSX_TOKEN }}
yarn: true
- name: Upload extension vsix to workflow artifacts
uses: actions/upload-artifact@v2
with:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,13 @@ jobs:
shell: bash
# Install test dependencies
- run: npm ci
- run: npm run webpack
- run: yarn install --immutable --immutable-cache --check-cache
- run: yarn run webpack

# Run the tests
- run: xvfb-run -s '-screen 0 640x480x16' -a npm test
- run: xvfb-run -s '-screen 0 640x480x16' -a yarn run test
if: runner.os == 'Linux'
- run: npm test
- run: yarn run test
if: runner.os != 'Linux'

# Upload test artefacts
Expand Down
10 changes: 5 additions & 5 deletions Contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

## Dependencies and Building

Run `npm install` in the project root to install the development dependencies.
Run `yarn install` in the project root to install the development dependencies.

You can also package up the extension with

- `npm install -g vsce` to get the Extension Manager,
- `npm install` to build the extension
- `yarn global add vsce` to get the Extension Manager,
- `yarn install` to build the extension
- `vsce package` which creates an extension package at `haskell-<version>.vsix`.

_Note:_ that if you get errors running `vsce package`, it might help running `tsc -p ./` directly, since that gives the actual error output of the TypeScript compilation.
_Note:_ that if you get errors running `vsce package`, it might help running `yarn run pretest` directly, since that gives the actual error output of the TypeScript compilation.

## Developing inside VS Code

Expand All @@ -29,7 +29,7 @@ _Note_: you can also reload (`Ctrl+R` or `Cmd+R` on macOS) the VS Code window wi

#### Formatting

[prettier](https://prettier.io) is automatically run o neach commit via husky. If you are developing within VS Code, the settings are set to auto format on save.
[prettier](https://prettier.io) is automatically run on each commit via husky. If you are developing within VS Code, the settings are set to auto format on save.
The configurations for prettier are located in `.prettierrc`.

## Navigating the Files
Expand Down
Loading

0 comments on commit b80f636

Please sign in to comment.