Skip to content

Commit bb02480

Browse files
authored
Merge branch 'master' into stirling-pdf@2.11.0
2 parents f6417a8 + 806bdc3 commit bb02480

1,147 files changed

Lines changed: 8307 additions & 4929 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.coderabbit.yaml

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
# yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json
2+
language: en
3+
chat:
4+
art: false
5+
reviews:
6+
profile: chill
7+
auto_review:
8+
enabled: true
9+
ignore_title_keywords:
10+
- "WIP"
11+
drafts: false
12+
base_branches:
13+
- master
14+
poem: false
15+
in_progress_fortune: false
16+
high_level_summary: false
17+
sequence_diagrams: false
18+
changed_files_summary: false
19+
suggested_reviewers: false
20+
finishing_touches:
21+
docstrings:
22+
enabled: false
23+
unit_tests:
24+
enabled: false
25+
auto_apply_labels: true
26+
labeling_instructions:
27+
- label: package-request-needed
28+
instructions: |
29+
If this is a NEWLY ADDED manifest file (not a modified or renamed file) and there is no linked GitHub issue in the description or PR body,
30+
apply the `package-request-needed` label to indicate that the contributor needs to create a package request issue and link it in the description or PR body.
31+
- label: not-meet-criteria
32+
instructions: |
33+
If this is a NEWLY ADDED manifest file (not a modified or renamed file) and this package does not meet the acceptance criteria for new package
34+
requests (reasonably well-known and widely used, stable release available, English interface/documentation), apply the `not-meet-criteria` label
35+
to indicate that this package will not be accepted.
36+
path_instructions:
37+
- path: "**"
38+
instructions: |
39+
If this file is a Scoop manifest, you MUST check for the following:
40+
1. [File Location & Name Validation]
41+
- Path Check: it MUST be located strictly within the `bucket/` or `deprecated/` directories. If it is placed elsewhere, warn the contributor.
42+
- Filename Rule:
43+
- The filename MUST consist ONLY of lowercase letters, numbers, hyphens (-), and dots (.), and MUST end with `.json`.
44+
- If the filename contains underscores (`_`), suggest replacing them with hyphens (`-`).
45+
- Line Endings: Scoop manifests must use CRLF line endings. Remind the contributor if you detect LF.
46+
47+
2. [New Package Request Policy]
48+
- If this is a NEWLY ADDED manifest file (not a modified or renamed file):
49+
- Check the `description` field or the PR body for a linked GitHub issue (e.g., #123 (must be a valid issue number) or an issue URL).
50+
If missing, you should warn the contributor to create a package request issue and link it in the description or PR body.
51+
- Ensure contributor knows the acceptance criteria for new package requests.
52+
- Acceptance criteria for new package requests:
53+
- Reasonably well-known and widely used (e.g. if it's a GitHub project, it should have at least 100 stars).
54+
- A stable release available (not in pre-release or alpha stage).
55+
- English interface (or at least English documentation).
56+
- Link to create package request issue:
57+
- https://github.com/ScoopInstaller/Extras/issues/new?labels=package-request&template=package-request.yml&title=%5BRequest%5D%3A+
58+
59+
3. [Autoupdate Precision]
60+
- NEVER allow hardcoded version numbers in the `autoupdate` block (e.g., `autoupdate.url` or `autoupdate.extract_dir`). They must use variables like `$version`, etc.
61+
- Cross-check:
62+
If the top-level `url`, `extract_dir`, or `architecture.*.url` contain a version number, ensure that these exact paths are properly parameterized in the `autoupdate`
63+
block so future automated updates won't miss them.
64+
65+
4. [Common Dependencies Check]
66+
- Pay close attention to packages that might require .NET, VCREDIST (Visual C++ Redistributable), etc.
67+
- If the application relies on these, check if they are correctly declared in the `suggest` fields using standard Scoop identifiers.
68+
69+
5. [Test Guidance]
70+
- Provide clear instructions for testing the manifest locally before submission:
71+
- Optional: Enable debug mode and set GitHub token (to access GitHub API for releases only):
72+
scoop config debug true
73+
scoop config gh_token <your-github-token> # Read access only
74+
- Force version detection and autoupdate (Replace <manifest-name> with the actual filename without `.json`):
75+
.\bin\checkver.ps1 -App <manifest-name> -f
76+
- Auto-format (Lint) the JSON manifest (Replace <manifest-name> with the actual filename without `.json`):
77+
.\bin\formatjson.ps1 -App <manifest-name>
78+
- Test installation for each architecture (if supported)
79+
scoop install <manifest-path> -a <architecture>
80+
81+
6. [Other Guidance]
82+
- For any violations of the above rules or other Scoop formatting issues, always provide a link to the official contribution guide or wiki to resolve their confusion.
83+
- Related links:
84+
- Contribution Guide: https://github.com/ScoopInstaller/.github/blob/main/.github/CONTRIBUTING.md
85+
- Wiki: https://github.com/ScoopInstaller/Scoop/wiki/App-Manifests

.github/workflows/ci.yml

Lines changed: 20 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,41 @@
1-
name: Tests
1+
name: CI
22

33
on:
44
pull_request:
55
push:
66
workflow_dispatch:
77

8+
permissions:
9+
contents: read
10+
811
jobs:
9-
test_powershell:
10-
name: WindowsPowerShell
12+
test:
13+
name: Test
1114
runs-on: windows-latest
15+
strategy:
16+
matrix:
17+
shell: [powershell, pwsh]
18+
defaults:
19+
run:
20+
shell: ${{ matrix.shell }}
1221
steps:
1322
- name: Checkout Bucket
14-
uses: actions/checkout@main
23+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1524
with:
25+
# Need at least 2 commits to properly gather changed files for linting
1626
fetch-depth: 2
1727
path: 'my_bucket'
1828
- name: Checkout Scoop
19-
uses: actions/checkout@main
29+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2030
with:
2131
repository: ScoopInstaller/Scoop
2232
path: 'scoop_core'
23-
- name: Init and Test
24-
shell: powershell
25-
run: |
26-
$env:SCOOP_HOME="$(Convert-Path '.\scoop_core')"
27-
.\scoop_core\test\bin\init.ps1
28-
.\my_bucket\bin\test.ps1
29-
test_pwsh:
30-
name: PowerShell
31-
runs-on: windows-latest
32-
steps:
33-
- name: Checkout Bucket
34-
uses: actions/checkout@main
33+
- name: Install and cache test dependencies
34+
uses: potatoqualitee/psmodulecache@ee5e9494714abf56f6efbfa51527b2aec5c761b8 # v6.2.1
3535
with:
36-
fetch-depth: 2
37-
path: 'my_bucket'
38-
- name: Checkout Scoop
39-
uses: actions/checkout@main
40-
with:
41-
repository: ScoopInstaller/Scoop
42-
path: 'scoop_core'
43-
- name: Init and Test
44-
shell: pwsh
36+
modules-to-cache: BuildHelpers, Pester
37+
shell: ${{ matrix.shell }}
38+
- name: Run tests
4539
run: |
4640
$env:SCOOP_HOME="$(Convert-Path '.\scoop_core')"
47-
.\scoop_core\test\bin\init.ps1
4841
.\my_bucket\bin\test.ps1

.github/workflows/excavator.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,24 @@
1+
name: Excavator
2+
13
on:
24
workflow_dispatch:
35
schedule:
46
# run every 4 hours
57
- cron: '20 */4 * * *'
6-
name: Excavator
8+
9+
permissions:
10+
contents: write
11+
712
jobs:
813
excavate:
914
name: Excavate
1015
runs-on: windows-latest
1116
steps:
12-
- uses: actions/checkout@main
17+
- name: Checkout
18+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1319
- name: Excavate
1420
uses: ScoopInstaller/GithubActions@main
1521
env:
1622
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1723
SKIP_UPDATED: '1'
24+
SCOOP_BRANCH: develop
Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,23 @@
1+
name: Commented Pull Request
2+
13
on:
24
issue_comment:
35
types: [ created ]
4-
name: Commented Pull Request
6+
7+
permissions:
8+
contents: read
9+
pull-requests: write
10+
511
jobs:
612
pullRequestHandler:
713
name: PullRequestHandler
814
runs-on: windows-latest
915
steps:
10-
- uses: actions/checkout@main
16+
- name: Checkout
17+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1118
- name: PullRequestHandler
1219
uses: ScoopInstaller/GithubActions@main
1320
if: startsWith(github.event.comment.body, '/verify')
1421
env:
1522
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
23+
SCOOP_BRANCH: develop

.github/workflows/issues.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,24 @@
1+
name: Issues
2+
13
on:
24
issues:
35
types: [ opened, labeled ]
4-
name: Issues
6+
7+
permissions:
8+
# Auto hash fixing commits
9+
contents: write
10+
issues: write
11+
512
jobs:
613
issueHandler:
714
name: IssueHandler
815
runs-on: windows-latest
916
steps:
10-
- uses: actions/checkout@main
17+
- name: Checkout
18+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1119
- name: IssueHandler
1220
uses: ScoopInstaller/GithubActions@main
1321
if: github.event.action == 'opened' || (github.event.action == 'labeled' && contains(github.event.issue.labels.*.name, 'verify'))
1422
env:
1523
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
24+
SCOOP_BRANCH: develop

.github/workflows/pull_request.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,22 @@
1+
name: Pull Requests
2+
13
on:
2-
pull_request_target:
4+
pull_request:
35
types: [ opened ]
4-
name: Pull Requests
6+
7+
permissions:
8+
contents: read
9+
pull-requests: write
10+
511
jobs:
612
pullRequestHandler:
713
name: PullRequestHandler
814
runs-on: windows-latest
915
steps:
10-
- uses: actions/checkout@main
16+
- name: Checkout
17+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1118
- name: PullRequestHandler
1219
uses: ScoopInstaller/GithubActions@main
1320
env:
1421
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
22+
SCOOP_BRANCH: develop

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@
33
._*
44
page.html
55
checkver-*.html
6+
.claude/settings.local.json

bucket/010editor.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "16.0.3",
2+
"version": "16.0.4",
33
"description": "Professional text and hex editor with Binary Templates technology.",
44
"homepage": "https://www.sweetscape.com/010editor/",
55
"license": {
@@ -9,13 +9,13 @@
99
"notes": "This is a free 30-day trial version. Please buy a copy of it for furthur evaluation.",
1010
"architecture": {
1111
"64bit": {
12-
"url": "https://download.sweetscape.com/010EditorWin64Portable16.0.3.zip",
13-
"hash": "eacb675626d0e53f29519cc1298361a669f5a24991b39109ffb5bdfa697452ca",
12+
"url": "https://download.sweetscape.com/010EditorWin64Portable16.0.4.zip",
13+
"hash": "f4512b246c5629fd080d41b5c866ced86a1400480c10fda0f5240008b2cd2675",
1414
"extract_dir": "010EditorWin64Portable"
1515
},
1616
"32bit": {
17-
"url": "https://download.sweetscape.com/010EditorWin32Portable16.0.3.zip",
18-
"hash": "9662c0133313b6a1d9b0a8e46337a132a7fa10fc3a07d9b109626dda88b43df0",
17+
"url": "https://download.sweetscape.com/010EditorWin32Portable16.0.4.zip",
18+
"hash": "addac0a09e359c92b5ce5818c4147eb6c36cbcc15a4019e4df6a57c03a1461f3",
1919
"extract_dir": "010EditorWin32Portable"
2020
}
2121
},

bucket/64gram.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "1.1.93",
2+
"version": "1.2.3",
33
"description": "Unofficial Telegram Desktop with some enhancements.",
44
"homepage": "https://64gr.am",
55
"license": {
@@ -8,8 +8,8 @@
88
},
99
"architecture": {
1010
"64bit": {
11-
"url": "https://github.com/TDesktop-x64/tdesktop/releases/download/v1.1.93/64Gram_1.1.93_x64.zip",
12-
"hash": "6785f093bcaa056ed16c78c885080de3f16c39516e00e336f32db746310cfaa6"
11+
"url": "https://github.com/TDesktop-x64/tdesktop/releases/download/v1.2.3/64Gram_1.2.3_x64.zip",
12+
"hash": "75ea31f025d7748b97aa363a4e8a5da4b34219f076f9b4d1e93317dafdd5f405"
1313
}
1414
},
1515
"pre_install": "if (Test-Path \"$persist_dir\\log.txt\") { Copy-Item \"$persist_dir\\log.txt\" \"$dir\\\" }",

bucket/86box.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
{
22
"version": "5.3",
33
"description": "Emulator of x86-based machines based on PCem.",
4-
"homepage": "https://github.com/86Box/86Box",
5-
"license": "GPL-2.0",
4+
"homepage": "https://86box.net/",
5+
"license": "GPL-2.0-or-later",
66
"architecture": {
77
"64bit": {
88
"url": "https://github.com/86Box/86Box/releases/download/v5.3/86Box-Windows-64-b8200.zip",
99
"hash": "1d60a087b7f2805bfd03e67ac834da4bdcf93d0d00ad1400923bdb3e93ecd2d8"
1010
}
1111
},
1212
"suggest": {
13-
"86Box Manager": "extras/86box-manager",
1413
"86Box ROMs": "extras/86box-roms"
1514
},
1615
"bin": "86Box.exe",
@@ -21,7 +20,7 @@
2120
]
2221
],
2322
"checkver": {
24-
"url": "https://api.github.com/repositories/61964127/releases/latest",
23+
"github": "https://api.github.com/repos/86Box/86Box/releases/latest",
2524
"jsonpath": "$.assets[*].browser_download_url",
2625
"regex": "v(?<version>[\\d.]+)/86Box-Windows-64-b(?<build>\\d+)\\.zip"
2726
},

0 commit comments

Comments
 (0)