Skip to content

Commit

Permalink
Merge branch 'main' into balaji-sivasakthi/peaceful-guanaco
Browse files Browse the repository at this point in the history
  • Loading branch information
aeschli authored Feb 21, 2024
2 parents cbc6149 + 3e2d799 commit 1adce32
Show file tree
Hide file tree
Showing 26 changed files with 3,760 additions and 2,104 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
- run: yarn --frozen-lockfile
- run: yarn test
- run: npm ci
- run: npm test
2 changes: 1 addition & 1 deletion .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ test/
.travis.yml
gulpfile.js
tslint.json
yarn.lock
package-lock.json
azure-pipelines.yml
.editorconfig
.mocharc.json
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ Development
-----------


- clone this repo, run yarn
- `yarn test` to compile and run tests
- clone this repo, run `npm install``
- `npm test` to compile and run tests

How can I run and debug the service?

Expand All @@ -53,8 +53,8 @@ How can I run and debug the service?
How can I run and debug the service inside an instance of VSCode?

- run VSCode out of sources setup as described here: https://github.com/Microsoft/vscode/wiki/How-to-Contribute
- run `yarn link` in the folder of `vscode-css-languageservice`
- use `yarn link vscode-css-languageservice` in `vscode/extensions/css-language-features/server` to run VSCode with the latest changes from `vscode-css-languageservice`
- run `npm link` in the folder of `vscode-css-languageservice`
- use `npm link vscode-css-languageservice` in `vscode/extensions/css-language-features/server` to run VSCode with the latest changes from `vscode-css-languageservice`
- run VSCode out of source (`vscode/scripts/code.sh|bat`) and open a `.css` file
- in VSCode window that is open on the `vscode-css-languageservice` sources, run command `Debug: Attach to Node process` and pick the `code-oss` process with the `css-language-features` path
![image](https://user-images.githubusercontent.com/6461412/94242567-842b1200-ff16-11ea-8f85-3ebb72d06ba8.png)
Expand Down
8 changes: 4 additions & 4 deletions build/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ extends:
- name: vscode-css-languageservice

buildSteps:
- script: yarn --frozen-lockfile
- script: npm ci
displayName: Install dependencies

# the rest of the build steps are part of the 'prepack' script, automatically run when the pipeline invokes 'yarn pack'
# the rest of the build steps are part of the 'prepack' script, automatically run when the pipeline invokes 'npm run pack'

tag: ${{ parameters.quality }}
preReleaseTag: next
Expand All @@ -57,7 +57,7 @@ extends:
- 16.x

testSteps:
- script: yarn --frozen-lockfile
- script: npm ci
displayName: Install dependencies
- script: yarn test
- script: npm test
displayName: Test npm package
Loading

0 comments on commit 1adce32

Please sign in to comment.