Skip to content

Commit 5dd71d4

Browse files
authored
Merge branch 'develop' into update-helper-before-install
2 parents b3a5da3 + cc8d7ca commit 5dd71d4

8 files changed

Lines changed: 80 additions & 111 deletions

File tree

.github/workflows/ci.yml

Lines changed: 16 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,29 @@
1-
name: Scoop Core CI Tests
1+
name: CI
22

33
on:
44
pull_request:
55
workflow_dispatch:
66

77
jobs:
8-
test_powershell:
9-
name: WindowsPowerShell
8+
test:
9+
name: Test
1010
runs-on: windows-latest
11+
strategy:
12+
matrix:
13+
shell: [powershell, pwsh]
14+
defaults:
15+
run:
16+
shell: ${{ matrix.shell }}
1117
steps:
1218
- name: Checkout
13-
uses: actions/checkout@main
19+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
1420
with:
21+
# Need at least 2 commits to properly gather changed files for linting
1522
fetch-depth: 2
16-
- name: Init Test Suite
17-
uses: potatoqualitee/psmodulecache@main
23+
- name: Install and cache test dependencies
24+
uses: potatoqualitee/psmodulecache@ee5e9494714abf56f6efbfa51527b2aec5c761b8 # v6.2.1
1825
with:
19-
modules-to-cache: BuildHelpers
20-
shell: powershell
21-
- name: Test Scoop Core
22-
shell: powershell
23-
run: ./test/bin/test.ps1
24-
test_pwsh:
25-
name: PowerShell
26-
runs-on: windows-latest
27-
steps:
28-
- name: Checkout
29-
uses: actions/checkout@main
30-
with:
31-
fetch-depth: 2
32-
- name: Init Test Suite
33-
uses: potatoqualitee/psmodulecache@main
34-
with:
35-
modules-to-cache: BuildHelpers
36-
shell: pwsh
37-
- name: Test Scoop Core
38-
shell: pwsh
26+
modules-to-cache: PSScriptAnalyzer, BuildHelpers, Pester
27+
shell: ${{ matrix.shell }}
28+
- name: Run tests
3929
run: ./test/bin/test.ps1

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,14 @@
1212
### Bug Fixes
1313

1414
- **core:** Fix the grep parameter in the `Invoke-GitLog` function ([#6407](https://github.com/ScoopInstaller/Scoop/issues/6407))
15+
- **buckets:** Skip Git invocation if unavailable in `new_issue_msg` ([#6591](https://github.com/ScoopInstaller/Scoop/issues/6591))
1516
- **buckets:** Fix the filtering condition when retrieving the number of manifests ([#6509](https://github.com/ScoopInstaller/Scoop/issues/6509))
1617
- **scoop-download:** Fix function `nightly_version` not defined error ([#6386](https://github.com/ScoopInstaller/Scoop/issues/6386))
1718
- **scoop-download:** Fix incorrect download success state ([#6473](https://github.com/ScoopInstaller/Scoop/issues/6473))
1819
- **scoop-uninstall:** Correct `-Global` Switch ([#6454](https://github.com/ScoopInstaller/Scoop/issues/6454))
1920
- **scoop-update:** Force sync tags w/ remote branch while scoop update ([#6439](https://github.com/ScoopInstaller/Scoop/issues/6439))
2021
- **autoupdate:** Use origin URL to handle URLs with fragment in GitHub mode ([#6455](https://github.com/ScoopInstaller/Scoop/issues/6455))
22+
- **autoupdate:** Ensure GitHub API requests use token ([#6535](https://github.com/ScoopInstaller/Scoop/issues/6535))
2123
- **buckets|scoop-info:** Switch git log date format to ISO 8601 to avoid locale issues ([#6446](https://github.com/ScoopInstaller/Scoop/issues/6446))
2224
- **scoop-version:** Fix logic error caused by missing brackets ([#6463](https://github.com/ScoopInstaller/Scoop/issues/6463))
2325
- **getopt:** Teach getopt to respect the `--%` token ([#6477](https://github.com/ScoopInstaller/Scoop/issues/6477))
@@ -32,16 +34,22 @@
3234
- **core:** Fix substitute handling of substring keys ([#6561](https://github.com/ScoopInstaller/Scoop/issues/6561))
3335
- **core:** Check `$deprecated_dir` exists before accessing it ([#6574](https://github.com/ScoopInstaller/Scoop/issues/6574))
3436
- **checkver:** Remove redundant always-true condition in GitHub checkver logic ([#6571](https://github.com/ScoopInstaller/Scoop/issues/6571))
37+
- **core:** Give `dark` higher priority when use `Extract-DarkArchive` ([#6637](https://github.com/ScoopInstaller/Scoop/issues/6637))
3538

3639
### Code Refactoring
3740

3841
- **output:** Replace raw prints with functions for standardized output ([#6449](https://github.com/ScoopInstaller/Scoop/issues/6449))
3942
- **output:** Combine the separated outputs into a single output ([#6545](https://github.com/ScoopInstaller/Scoop/issues/6545))
43+
- **scoop-list:** Use simpler method to check the deprecated status of the manifest to improve performance ([#6599](https://github.com/ScoopInstaller/Scoop/issues/6599))
4044

4145
### Builds
4246

4347
- **supporting:** Update System.Data.SQLite to 2.0.2 ([#6555](https://github.com/ScoopInstaller/Scoop/issues/6555), [#6560](https://github.com/ScoopInstaller/Scoop/issues/6560))
4448

49+
### Continuous Integration
50+
51+
- **workflow:** Drop Appveyor support and refactor GitHub Actions workflow ([#6626](https://github.com/ScoopInstaller/Scoop/issues/6626))
52+
4553
## [v0.5.3](https://github.com/ScoopInstaller/Scoop/compare/v0.5.2...v0.5.3) - 2025-08-11
4654

4755
### Features

README.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@
2424
<a href="https://discord.gg/s9yRQHt">
2525
<img src="https://img.shields.io/badge/chat-on%20discord-7289DA.svg" alt="Discord Chat" />
2626
</a>
27-
<a href="https://gitter.im/lukesampson/scoop">
28-
<img src="https://badges.gitter.im/lukesampson/scoop.png" alt="Gitter Chat" />
29-
</a>
3027
<a href="./LICENSE">
3128
<img src="https://img.shields.io/badge/license-UNLICENSE%20or%20MIT-blue" alt="License" />
3229
</a>

appveyor.yml

Lines changed: 0 additions & 35 deletions
This file was deleted.

lib/autoupdate.ps1

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,12 @@ function find_hash_in_json([String] $url, [Hashtable] $substitutions, [String] $
118118
$wc = New-Object Net.Webclient
119119
$wc.Headers.Add('Referer', (strip_filename $url))
120120
$wc.Headers.Add('User-Agent', (Get-UserAgent))
121+
122+
if (($url -match '^https?://api\.github\.com/.*') -and (Get-GitHubToken)) {
123+
$wc.Headers.Add('Authorization', "Bearer $(Get-GitHubToken)")
124+
$wc.Headers.Add('X-GitHub-Api-Version', '2022-11-28')
125+
}
126+
121127
$data = $wc.DownloadData($url)
122128
$ms = New-Object System.IO.MemoryStream
123129
$ms.Write($data, 0, $data.Length)

lib/buckets.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ function new_issue_msg($app, $bucket, $title, $body) {
190190
$url = known_bucket_repo $bucket
191191
$bucket_path = "$bucketsdir\$bucket"
192192

193-
if (Test-Path $bucket_path) {
193+
if ((Test-Path $bucket_path) -and (Test-GitAvailable)) {
194194
$remote = Invoke-Git -Path $bucket_path -ArgumentList @('config', '--get', 'remote.origin.url')
195195
# Support ssh and http syntax
196196
# git@PROVIDER:USER/REPO.git

0 commit comments

Comments
 (0)