Skip to content

Commit

Permalink
Merge pull request #103 from openlawlibrary/danixeee/update-azure-pip…
Browse files Browse the repository at this point in the history
…elines

Update azure pipelines build script
  • Loading branch information
danixeee authored Feb 12, 2020
2 parents 3728b42 + b38ea85 commit 046a3b9
Show file tree
Hide file tree
Showing 13 changed files with 193 additions and 1,114 deletions.
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
.vscode/settings.json
.idea

*.vsix

# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
Expand Down Expand Up @@ -105,3 +107,6 @@ venv.bak/

# OS files
.DS_Store

# mypy
.mypy_cache
20 changes: 14 additions & 6 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,27 @@ and this project adheres to [Semantic Versioning][semver].

### Changed

- Fixed `@command`, `@feature` and `@thread` decorators to retain type of wrapped functions ([#89])
- Fixed missing `Undo` member from `FailureHandlingKind` in types ([#98])

[#89]: https://github.com/openlawlibrary/pygls/pull/89
[#98]: https://github.com/openlawlibrary/pygls/pull/98
- Fixed `@command`, `@feature` and `@thread` decorators to retain type of wrapped functions ([#89])

### Added

- Add comparisons and repr support to Range and Location types ([#90])
- _Azure Pipelines_ build script ([#100] and [#103])
- Run tests and linters on multiple python versions with _tox_ ([#100])
- Use python enums in types module ([#92])
- Add comparisons and repr support to Range and Location types ([#90])

[#90]: https://github.com/openlawlibrary/pygls/pull/90
### Removed

- _appveyor_ build script ([#103])


[#103]: https://github.com/openlawlibrary/pygls/pull/103
[#100]: https://github.com/openlawlibrary/pygls/pull/100
[#98]: https://github.com/openlawlibrary/pygls/pull/98
[#92]: https://github.com/openlawlibrary/pygls/pull/92
[#90]: https://github.com/openlawlibrary/pygls/pull/90
[#89]: https://github.com/openlawlibrary/pygls/pull/89

## [0.8.1] - 09/05/2019

Expand Down
172 changes: 0 additions & 172 deletions appveyor.yml

This file was deleted.

33 changes: 26 additions & 7 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,22 +59,41 @@ steps:
displayName: "tox"

- bash: |
cd examples/json-extension
# install extension-wide js dependencies
npm install --save-dev
# run tslint
# install dependencies
npm i
npm i vsce
npx tslint client/src/*.ts
# install our dependencies
npm install # TODO: replace with `yarn install`
npm run compile
# replace package.json version
replace_packagejson_version() {
version_line=$(grep -o '"version".*' $1)
version=$(python -m json.tool package.json | awk -F'"' '/version/{print $4}')
build_version=$version+$2
build_version_line=${version_line/$version/$build_version}
sed -i "s|$version_line|$build_version_line|g" $1
}
replace_packagejson_version package.json $(Build.BuildId)
./node_modules/.bin/vsce package
# check to see if key files will be in the `.vsix` package to be built
npx vsce ls | grep package.json
npx vsce ls | grep out/extension.js
npx vsce ls | grep server/__init__.py
npx vsce ls | grep server/__main__.py
npx vsce ls | grep server/server.py
displayName: "build and check sample extension"
# move vsix to staging dir
mv *.vsix $(Build.ArtifactStagingDirectory)
workingDirectory: examples/json-extension
displayName: "Install and build json-extension"
condition: and(eq(variables['Agent.OS'], 'Linux'), eq(variables['python.version'], '3.5'))
- task: PublishBuildArtifacts@1
displayName: 'Publish vsix'
condition: and(eq(variables['Agent.OS'], 'Linux'), eq(variables['python.version'], '3.5'))

- script: |
python --version
Expand Down
4 changes: 2 additions & 2 deletions examples/json-extension/.vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
"version": "0.2.0",
"configurations": [
{
"name": "Launch Client",
"type": "extensionHost",
"request": "launch",
"name": "Launch Client",
"runtimeExecutable": "${execPath}",
"sourceMaps": true,
"args": [
Expand All @@ -14,7 +14,7 @@
"outFiles": [
"${workspaceRoot}/client/out/**/*.js"
],
"preLaunchTask": "json-extension-watch:client",
"preLaunchTask": "compile:client",
"env": {
"VSCODE_DEBUG_MODE": "true"
}
Expand Down
22 changes: 12 additions & 10 deletions examples/json-extension/.vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
{
// See https://go.microsoft.com/fwlink/?LinkId=733558
// for the documentation about the tasks.json format
"version": "2.0.0",
"tasks": [
{
"label": "json-extension-watch:client",
"type": "typescript",
"tsconfig": "tsconfig.json",
"option": "watch",
"problemMatcher": [
"$tsc-watch"
]
}
"label": "compile:client",
"type": "shell",
"command": "tsc",
"group": {
"kind": "build",
"isDefault": true
},
"presentation": {
"panel": "shared",
"reveal": "silent",
},
},
]
}
9 changes: 3 additions & 6 deletions examples/json-extension/.vscodeignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
.vscode
.gitignore

client

client/out/*.map
client/src/
tsconfig.json
tslint.json

out/*.map

package.json
package-lock.json

.pytest_cache
Loading

0 comments on commit 046a3b9

Please sign in to comment.