Skip to content

Commit

Permalink
Merge pull request #160 from paulober/develop
Browse files Browse the repository at this point in the history
Patch v3.4.2
  • Loading branch information
paulober committed Nov 6, 2023
2 parents 7c80378 + 89d9850 commit bc9fd98
Show file tree
Hide file tree
Showing 9 changed files with 32 additions and 16 deletions.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
1 change: 1 addition & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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-<issue-id>-<short-title-of-the-issue>`
- Create a branch based on the `develop` branch with following naming scheeme `fix-<issue-id>-<short-title-of-the-issue>`
- Download your fork of the repository (Github.cli recommended)
- `cd Pico-W-Go`
- `cd MicroPico`
- Switch to your newly created branch (`git checkout <branch-name>` for example)
- `npm install`

Expand All @@ -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 #<issue-id>, <Short title of the issue>`
- 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
18 changes: 9 additions & 9 deletions 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 package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
3 changes: 3 additions & 0 deletions scripts/publish.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions src/activator.mts
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
4 changes: 4 additions & 0 deletions src/settings.mts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down

0 comments on commit bc9fd98

Please sign in to comment.