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
2 changes: 1 addition & 1 deletion .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
// the command is a shell script
"type": "shell",
// we run the custom npm script "compile" as defined in package.json
"command": "npm run compile --loglevel silent",
"command": "yarn run compile --loglevel silent",
// show the output window only if unrecognized errors occur.
"presentation": {
"reveal": "silent"
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ All contributions are welcome!
├──── yaml-language-server/
```

3. Run `npm install` in both directories to initialize `node_modules` dependencies.
3. Run `yarn install` in both directories to initialize `node_modules` dependencies.

4. In `vscode-yaml/src/extension.ts` set the `serverModule` variable to:

Expand All @@ -59,7 +59,7 @@ All contributions are welcome!
5. In BOTH directories run:

```bash
npm run compile
yarn run compile
```

6. To run the language server in VSCode, click `View -> Debug`, then from the drop down menu beside the green arrow select `Launch Extension (vscode-yaml)`, click the arrow, and a new VSCode window should load with the YAML LS running.
Expand Down
18 changes: 9 additions & 9 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
def installBuildRequirements(){
def nodeHome = tool 'nodejs-12.20.0'
env.PATH="${env.PATH}:${nodeHome}/bin"
sh "npm install -g typescript"
sh "npm install -g vsce"
sh "yarn install -g typescript"
sh "yarn install -g vsce"
}

def buildVscodeExtension(){
sh "npm install"
sh "npm run vscode:prepublish"
sh "yarn install"
sh "yarn run vscode:prepublish"
}

node('rhel8'){
Expand All @@ -22,13 +22,13 @@ node('rhel8'){
installBuildRequirements()

stage 'Build vscode-yaml'
sh "npm install"
sh "npm run build"
sh "npm run check-dependencies"
sh "yarn install"
sh "yarn run build"
sh "yarn run check-dependencies"

stage 'Test vscode-yaml for staging'
wrap([$class: 'Xvnc']) {
sh "npm test --silent"
sh "yarn test --silent"
}

stage "Package vscode-yaml"
Expand Down Expand Up @@ -56,7 +56,7 @@ node('rhel8'){
}

// Open-vsx Marketplace
sh "npm install -g ovsx"
sh "yarn install -g ovsx"
withCredentials([[$class: 'StringBinding', credentialsId: 'open-vsx-access-token', variable: 'OVSX_TOKEN']]) {
sh 'ovsx publish -p ${OVSX_TOKEN}' + " ${vsix[0].path}"
}
Expand Down
Loading