Skip to content

Commit

Permalink
Merge branch 'master' into rename
Browse files Browse the repository at this point in the history
  • Loading branch information
ivojawer committed Jan 4, 2024
2 parents fc10220 + ba30dab commit ab0e411
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 23 deletions.
30 changes: 18 additions & 12 deletions .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,15 @@ jobs:
node-version: ${{ matrix.node-version }}
- run: npm install
- run: npm run compile
- name: Run headless test
if: matrix.os != 'ubuntu-latest' # we need to fix ubuntu-latest first
uses: smithki/[email protected]
with:
run: npm run test-with-coverage:e2e

# we need to test for windows > 1.85.1, current version breaks
# node 18.18.2 & vscode 1.84.2 works
# - name: Run headless test
# if: matrix.os == 'windows-latest'
# uses: coactions/setup-xvfb@v1
# with:
# run: npm run test-with-coverage:e2e

- name: Unit Tests
run: npm run test-with-coverage:unit
- name: Update server coverage badge
Expand All @@ -41,13 +45,15 @@ jobs:
files: ./server/coverage/coverage-final.json
verbose: true
flags: lsp-ide-server
- name: Update client coverage badge
uses: codecov/codecov-action@v3
if: matrix.os == 'windows-latest'
with:
files: ./client/coverage/coverage-final.json
verbose: true
flags: lsp-ide-client

# - name: Update client coverage badge
# uses: codecov/codecov-action@v3
# if: matrix.os == 'windows-latest'
# with:
# files: ./client/coverage/coverage-final.json
# verbose: true
# flags: lsp-ide-client

- name: Generate VSIX file
if: matrix.os == 'ubuntu-latest' && github.ref == 'refs/heads/master'
run: |
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## v0.2.0

- New feature released: Formatter! 💅🏼
- Fixing Test Runner for Windows 🩹
- Upgrade Wollok-TS 4.0.6 ⬆️

## v0.1.2

- Upgrade Node to lts/hydrogen 18 ⬆️
Expand Down
12 changes: 6 additions & 6 deletions client/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
"url": "https://github.com/uqbar-project/wollok-lsp-ide"
},
"engines": {
"vscode": "^1.80.0"
"vscode": "^1.80"
},
"dependencies": {
"@types/vscode": "^1.83.0"
"@types/vscode": "^1.80.0"
},
"devDependencies": {
"@vscode/test-electron": "^2.3.5",
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"author": "Uqbar Foundation",
"license": "LGPL-3.0",
"publisher": "uqbar",
"version": "0.1.2",
"version": "0.2.0",
"repository": {
"type": "git",
"url": "https://github.com/uqbar-project/wollok-lsp-ide"
Expand Down

0 comments on commit ab0e411

Please sign in to comment.