From dcd836b0d687e8194251a14fc949c5e5ba207224 Mon Sep 17 00:00:00 2001 From: paulober <44974737+paulober@users.noreply.github.com> Date: Thu, 19 Oct 2023 20:05:42 +0200 Subject: [PATCH 1/6] Added Open VSX deployment Signed-off-by: paulober <44974737+paulober@users.noreply.github.com> --- .github/workflows/publish.yml | 1 + scripts/publish.sh | 3 +++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 0b6edde..2d7692c 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -42,6 +42,7 @@ jobs: run: ./scripts/publish.sh env: VSCE_PAT: ${{ secrets.VSCE_PAT }} + OVSX_PAT: ${{ secrets.OPEN_VSX_TOKEN }} - name: Upload Artifacts uses: actions/upload-artifact@v3 diff --git a/scripts/publish.sh b/scripts/publish.sh index 737477f..ea5fe16 100755 --- a/scripts/publish.sh +++ b/scripts/publish.sh @@ -38,5 +38,8 @@ done # Find all .vsix files and publish them one by one find . -name "*.vsix" -type f | while read -r package_path; do + # Publish the VSCode extension to the VSCode Marketplace npx @vscode/vsce publish --packagePath "$package_path" + # Publish the VSCode extension to the Open VSX Registry + npx ovsx publish "$package_path" -p "$OVSX_PAT" done From a6910391dca109f45aed35794359deb0d4ee1516 Mon Sep 17 00:00:00 2001 From: paulober <44974737+paulober@users.noreply.github.com> Date: Sun, 29 Oct 2023 20:19:34 +0100 Subject: [PATCH 2/6] Reload settings before autoConnect Signed-off-by: paulober <44974737+paulober@users.noreply.github.com> --- src/activator.mts | 1 + src/settings.mts | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/src/activator.mts b/src/activator.mts index 27705af..115e682 100644 --- a/src/activator.mts +++ b/src/activator.mts @@ -1086,6 +1086,7 @@ export default class Activator { return; } this.ui?.refreshState(false); + settings.reload(); const autoPort = settings.getBoolean(SettingsKey.autoConnect); const ports = await PyboardRunner.getPorts(); diff --git a/src/settings.mts b/src/settings.mts index ab9eb18..cd9952d 100644 --- a/src/settings.mts +++ b/src/settings.mts @@ -30,6 +30,10 @@ export default class Settings { this.context = context; } + public reload(): void { + this.config = vsWorkspace.getConfiguration(extName); + } + public get(key: SettingsKey): Setting { return this.config.get(key); } From 7767e0c590e42471967a0d3794738954093fed69 Mon Sep 17 00:00:00 2001 From: paulober <44974737+paulober@users.noreply.github.com> Date: Sun, 29 Oct 2023 20:22:14 +0100 Subject: [PATCH 3/6] Update CONTRIBUTING.md Signed-off-by: paulober <44974737+paulober@users.noreply.github.com> --- CONTRIBUTING.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f42eaef..abd4b23 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -7,9 +7,9 @@ In order to install `paulober/pyboard-serial-com` sub-package you first have con ### - Project setup - Fork the repository into your private account -- Create a branch with following naming scheeme `fix--` +- Create a branch based on the `develop` branch with following naming scheeme `fix--` - Download your fork of the repository (Github.cli recommended) -- `cd Pico-W-Go` +- `cd MicroPico` - Switch to your newly created branch (`git checkout ` for example) - `npm install` @@ -20,4 +20,4 @@ After the fix is complete do some extensive testing if all what could be affecte - Now squash all your commits and name the final commit something like `Fix #, ` - The description of the squash commit should contain a list (description) of all the changes you've made -- Push and create a pull request to the develop branch of paulober/Pico-W-Go +- Push and create a pull request to the develop branch of paulober/MicroPico From 255f9e29932b87b09ea147721ebb6172893932a1 Mon Sep 17 00:00:00 2001 From: paulober <44974737+paulober@users.noreply.github.com> Date: Tue, 31 Oct 2023 21:25:50 +0100 Subject: [PATCH 4/6] Update issues config for new stubs Signed-off-by: paulober <44974737+paulober@users.noreply.github.com> --- .github/ISSUE_TEMPLATE/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 67fd3bc..c990d85 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -4,5 +4,5 @@ contact_links: url: https://github.com/paulober/MicroPico/blob/main/CHANGELOG.md about: Functionality that has changed significantly between versions of MicroPico or known issues. - name: Intellisense, auto-complete and linting issues - url: https://github.com/paulober/Pico-W-Stub/issues - about: These belong in the Pico-W-Stub project rather than MicroPico. + url: https://github.com/Josverl/micropython-stubs/issues + about: These belong in the Micropython-Stubs project by Josverl rather than MicroPico. From 40d7db5b0d2fde3fdab4be415b99aa7bd3a6f3b1 Mon Sep 17 00:00:00 2001 From: paulober <44974737+paulober@users.noreply.github.com> Date: Mon, 6 Nov 2023 23:55:33 +0100 Subject: [PATCH 5/6] Upgrade to pyboard-serial-com v2.0.4 Signed-off-by: paulober <44974737+paulober@users.noreply.github.com> --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 387f255..4f163ed 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,7 +19,7 @@ "linux" ], "dependencies": { - "@paulober/pyboard-serial-com": "^2.0.3", + "@paulober/pyboard-serial-com": "^2.0.4", "fs-extra": "^11.1.1", "lodash": "^4.17.21", "rimraf": "^5.0.5", @@ -306,9 +306,9 @@ } }, "node_modules/@paulober/pyboard-serial-com": { - "version": "2.0.3", - "resolved": "https://npm.pkg.github.com/download/@paulober/pyboard-serial-com/2.0.3/84884f13db7d2875dc584b78c084174b46933ced", - "integrity": "sha512-+6diUJ171h7u8OblJh20a9HTThJwObfu2w/GMpRvOYW2XN4PqI2/0s9aoY9cEtiu4eiegqtfDpDFy7Uy2xALew==", + "version": "2.0.4", + "resolved": "https://npm.pkg.github.com/download/@paulober/pyboard-serial-com/2.0.4/c28c41f6696f8f927b3c57ad82080fdbabdec0dc", + "integrity": "sha512-Vr85fbuwP9RfmFNC2kP3BUmfoaWH1L+eAogNljcTOHQ63hVwa7ucTC0TANf8lJZwH6mu4+afHhMNL9kS0SfC+g==", "license": "Apache-2.0", "dependencies": { "uuid": "^9.0.1" @@ -3679,9 +3679,9 @@ } }, "@paulober/pyboard-serial-com": { - "version": "2.0.3", - "resolved": "https://npm.pkg.github.com/download/@paulober/pyboard-serial-com/2.0.3/84884f13db7d2875dc584b78c084174b46933ced", - "integrity": "sha512-+6diUJ171h7u8OblJh20a9HTThJwObfu2w/GMpRvOYW2XN4PqI2/0s9aoY9cEtiu4eiegqtfDpDFy7Uy2xALew==", + "version": "2.0.4", + "resolved": "https://npm.pkg.github.com/download/@paulober/pyboard-serial-com/2.0.4/c28c41f6696f8f927b3c57ad82080fdbabdec0dc", + "integrity": "sha512-Vr85fbuwP9RfmFNC2kP3BUmfoaWH1L+eAogNljcTOHQ63hVwa7ucTC0TANf8lJZwH6mu4+afHhMNL9kS0SfC+g==", "requires": { "uuid": "^9.0.1" } diff --git a/package.json b/package.json index 92389c0..4678056 100644 --- a/package.json +++ b/package.json @@ -527,7 +527,7 @@ "typescript": "^5.2.2" }, "dependencies": { - "@paulober/pyboard-serial-com": "^2.0.3", + "@paulober/pyboard-serial-com": "^2.0.4", "fs-extra": "^11.1.1", "lodash": "^4.17.21", "rimraf": "^5.0.5", From 89d98503137447464917ee1c273e9b2d519a95a4 Mon Sep 17 00:00:00 2001 From: paulober <44974737+paulober@users.noreply.github.com> Date: Tue, 7 Nov 2023 00:01:01 +0100 Subject: [PATCH 6/6] v3.4.2 Signed-off-by: paulober <44974737+paulober@users.noreply.github.com> --- CHANGELOG.md | 7 +++++++ package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8db2b73..29c285f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,13 @@ All notable changes to the "MicroPico" extension will be documented in this file --- +## [3.4.2] - 2023-11-07 + +# Changed +- Upgraded to `pyboard-serial-com` `v2.0.4`, Linux `arm64` and `armhf` releases are now backwards compatible with `GLIBC_2.31` (Fixes #159) +- Updated dependencies +- Reload settings before auto-connect to detect settings changes concerning the port + ## [3.4.1] - 2023-10-19 # Changed diff --git a/package-lock.json b/package-lock.json index 4f163ed..0f57c5c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "pico-w-go", - "version": "3.4.1", + "version": "3.4.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "pico-w-go", - "version": "3.4.1", + "version": "3.4.2", "cpu": [ "x64", "arm64" diff --git a/package.json b/package.json index 4678056..03726db 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "pico-w-go", "displayName": "MicroPico", "description": "Auto-completion, remote workspace and a REPL console integration for the Raspberry Pi Pico (W) with MicroPython firmware.", - "version": "3.4.1", + "version": "3.4.2", "publisher": "paulober", "license": "MPL-2.0", "homepage": "https://github.com/paulober/MicroPico/blob/main/README.md",