Skip to content

Commit 9adef12

Browse files
committed
Merge branch 'develop' into fix-install-status
2 parents 4e8b533 + e09127f commit 9adef12

4 files changed

Lines changed: 6 additions & 4 deletions

File tree

.github/workflows/ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ name: Tests
22

33
on:
44
pull_request:
5-
push:
65
workflow_dispatch:
76

87
jobs:

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
- **status:** Correctly handle failed installation of apps ([#4676](https://github.com/ScoopInstaller/Scoop/issues/4676))
1919
- **shim:** Fix PS1 shim error when in different drive in PS7 ([#4614](https://github.com/ScoopInstaller/Scoop/issues/4614))
2020
- **shim:** Fix `sh` shim error in WSL ([#4637](https://github.com/ScoopInstaller/Scoop/issues/4637))
21+
- **versions:** Fix wrong version number when only one version dir ([#4679](https://github.com/ScoopInstaller/Scoop/issues/4679))
2122
- **scoop-cleanup:** Remove apps other than current version ([#4665](https://github.com/ScoopInstaller/Scoop/issues/4665))
2223
- **scoop-update:** Skip updating non git buckets ([#4670](https://github.com/ScoopInstaller/Scoop/issues/4670))
2324
- **scoop-update:** Remove 'Done.' output ([#4672](https://github.com/ScoopInstaller/Scoop/issues/4672))
@@ -32,8 +33,10 @@
3233
- **checkver:** Fix output with '-Version' ([#3774](https://github.com/ScoopInstaller/Scoop/issues/3774))
3334
- **schema:** Add '$schema' property ([#4623](https://github.com/ScoopInstaller/Scoop/issues/4623))
3435
- **schema:** Add explicit escape to opening bracket matcher in jp/jsonpath regex ([#3719](https://github.com/ScoopInstaller/Scoop/issues/3719))
36+
- **schema:** Fix typo ('note' -> 'notes') ([#4678](https://github.com/ScoopInstaller/Scoop/issues/4678))
3537
- **tests:** Support both AppVeyor and GitHub Actions ([#4655](https://github.com/ScoopInstaller/Scoop/issues/4655))
3638
- **tests:** Run GitHub Actions CI on each commit ([#4664](https://github.com/ScoopInstaller/Scoop/issues/4664))
39+
- **tests:** Disable CI test on 'push' ([#4677](https://github.com/ScoopInstaller/Scoop/issues/4677))
3740
- **vscode-settings:** Remove 'formatOnSave' trigger ([#4635](https://github.com/ScoopInstaller/Scoop/issues/4635))
3841

3942
### Styles

lib/versions.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ function Select-CurrentVersion {
5959
} else {
6060
$installedVersion = Get-InstalledVersion -AppName $AppName -Global:$Global
6161
if ($installedVersion) {
62-
$currentVersion = $installedVersion[-1]
62+
$currentVersion = @($installedVersion)[-1]
6363
} else {
6464
$currentVersion = $null
6565
}

schema.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@
226226
"license": {
227227
"$ref": "#/definitions/license"
228228
},
229-
"note": {
229+
"notes": {
230230
"$ref": "#/definitions/stringOrArrayOfStrings"
231231
}
232232
},
@@ -239,7 +239,7 @@
239239
},
240240
{
241241
"properties": {
242-
"note": {
242+
"notes": {
243243
"$ref": "#/definitions/stringOrArrayOfStrings"
244244
},
245245
"architecture": {

0 commit comments

Comments
 (0)