Skip to content

Commit cc9b474

Browse files
B67687B67687
committed
Merge upstream/master and resolve conflict
2 parents d316f83 + e26ce38 commit cc9b474

124 files changed

Lines changed: 1120 additions & 618 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.

‎.github/workflows/ci.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ on:
55
push:
66
workflow_dispatch:
77

8+
permissions:
9+
contents: read
10+
811
jobs:
912
test:
1013
name: Test
@@ -26,6 +29,7 @@ jobs:
2629
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2730
with:
2831
repository: ScoopInstaller/Scoop
32+
ref: 'develop'
2933
path: 'scoop_core'
3034
- name: Install and cache test dependencies
3135
uses: potatoqualitee/psmodulecache@ee5e9494714abf56f6efbfa51527b2aec5c761b8 # v6.2.1

‎.github/workflows/excavator.yml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,23 @@
1+
name: Excavator
2+
13
on:
24
workflow_dispatch:
35
schedule:
46
- cron: '0 */4 * * *'
5-
name: Excavator
7+
8+
permissions:
9+
contents: write
10+
611
jobs:
712
excavate:
813
name: Excavate
914
runs-on: windows-latest
1015
steps:
11-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
16+
- name: Checkout
17+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1218
- name: Excavate
1319
uses: ScoopInstaller/GithubActions@main
1420
env:
1521
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1622
SKIP_UPDATED: '1'
23+
SCOOP_BRANCH: develop

‎.github/workflows/issue_comment.yml‎

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@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
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@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
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: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,22 @@
1+
name: Pull Requests
2+
13
on:
24
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@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
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

‎bucket/corretto-jdk.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"description": "Amazon Corretto is a no-cost, multiplatform, production-ready distribution of the Open Java Development Kit (OpenJDK)",
33
"homepage": "https://aws.amazon.com/corretto/",
4-
"version": "21.0.10.7.1",
4+
"version": "21.0.11.10.1",
55
"license": "GPL-2.0-only WITH Classpath-exception-2.0",
66
"architecture": {
77
"64bit": {
8-
"url": "https://corretto.aws/downloads/resources/21.0.10.7.1/amazon-corretto-21.0.10.7.1-windows-x64-jdk.zip",
9-
"hash": "ea03f291937e6b32700fa325ec2bf77dcf570f1ace8ef0f01e752d66c035877e"
8+
"url": "https://corretto.aws/downloads/resources/21.0.11.10.1/amazon-corretto-21.0.11.10.1-windows-x64-jdk.zip",
9+
"hash": "5d63fdb5a19393081919afc0daa4ce82a7fadcced569981a995529caed28fb14"
1010
}
1111
},
12-
"extract_dir": "jdk21.0.10_7",
12+
"extract_dir": "jdk21.0.11_10",
1313
"env_add_path": "bin",
1414
"env_set": {
1515
"JAVA_HOME": "$dir"

‎bucket/corretto-lts-jdk.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"description": "Amazon Corretto is a no-cost, multiplatform, production-ready distribution of the Open Java Development Kit (OpenJDK)",
33
"homepage": "https://aws.amazon.com/corretto/",
4-
"version": "17.0.18.9.1",
4+
"version": "17.0.19.10.1",
55
"license": "GPL-2.0-only WITH Classpath-exception-2.0",
66
"architecture": {
77
"64bit": {
8-
"url": "https://corretto.aws/downloads/resources/17.0.18.9.1/amazon-corretto-17.0.18.9.1-windows-x64-jdk.zip",
9-
"hash": "ce2305ec89c93ffda7c13bec0c81e92732fb7c2f990cdc6793057009582ccaa6"
8+
"url": "https://corretto.aws/downloads/resources/17.0.19.10.1/amazon-corretto-17.0.19.10.1-windows-x64-jdk.zip",
9+
"hash": "ab748d9814d99a848916b54b36ae0f1d104493e61a19e1887072b4db9802c6ac"
1010
}
1111
},
12-
"extract_dir": "jdk17.0.18_9",
12+
"extract_dir": "jdk17.0.19_10",
1313
"env_add_path": "bin",
1414
"env_set": {
1515
"JAVA_HOME": "$dir"

‎bucket/corretto11-jdk.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
22
"description": "Amazon Corretto is a no-cost, multiplatform, production-ready distribution of the Open Java Development Kit (OpenJDK)",
33
"homepage": "https://aws.amazon.com/corretto/",
4-
"version": "11.0.30.7.1",
4+
"version": "11.0.31.11.1",
55
"license": "GPL-2.0-only WITH Classpath-exception-2.0",
66
"architecture": {
77
"64bit": {
8-
"url": "https://corretto.aws/downloads/resources/11.0.30.7.1/amazon-corretto-11.0.30.7.1-windows-x64-jdk.zip",
9-
"hash": "b0e18b9ae209351d483057bc0c28baf39c59e3991c6e592d32adbaf3962155c7"
8+
"url": "https://corretto.aws/downloads/resources/11.0.31.11.1/amazon-corretto-11.0.31.11.1-windows-x64-jdk.zip",
9+
"hash": "462f2a455d8f8da1a3a839a0f3de10c7a5fe6f7d230cf995e144a769382f4afe"
1010
},
1111
"32bit": {
12-
"url": "https://corretto.aws/downloads/resources/11.0.30.7.1/amazon-corretto-11.0.30.7.1-windows-x86-jre.zip",
13-
"hash": "a236cd8439a6f5c79d12d44473b076cfe1cb1bc07bd45955aa095fcc50e80508"
12+
"url": "https://corretto.aws/downloads/resources/11.0.31.11.1/amazon-corretto-11.0.31.11.1-windows-x86-jdk.zip",
13+
"hash": "8bf7d4329575956a5fbd6eb4afdea0121e50e62b2525d662d0a6fa9e73f7f579"
1414
}
1515
},
16-
"extract_dir": "jdk11.0.30_7",
16+
"extract_dir": "jdk11.0.31_11",
1717
"env_add_path": "bin",
1818
"env_set": {
1919
"JAVA_HOME": "$dir"
@@ -33,7 +33,7 @@
3333
}
3434
},
3535
"32bit": {
36-
"url": "https://corretto.aws/downloads/resources/$version/amazon-corretto-$version-windows-x86-jre.zip",
36+
"url": "https://corretto.aws/downloads/resources/$version/amazon-corretto-$version-windows-x86-jdk.zip",
3737
"hash": {
3838
"url": "https://github.com/corretto/corretto-downloads/raw/main/latest_links/indexmap_with_checksum.json",
3939
"jsonpath": "$.windows.x86.jdk.11.zip.checksum_sha256"

‎bucket/corretto17-jdk.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"description": "Amazon Corretto is a no-cost, multiplatform, production-ready distribution of the Open Java Development Kit (OpenJDK)",
33
"homepage": "https://aws.amazon.com/corretto/",
4-
"version": "17.0.18.9.1",
4+
"version": "17.0.19.10.1",
55
"license": "GPL-2.0-only WITH Classpath-exception-2.0",
66
"architecture": {
77
"64bit": {
8-
"url": "https://corretto.aws/downloads/resources/17.0.18.9.1/amazon-corretto-17.0.18.9.1-windows-x64-jdk.zip",
9-
"hash": "ce2305ec89c93ffda7c13bec0c81e92732fb7c2f990cdc6793057009582ccaa6"
8+
"url": "https://corretto.aws/downloads/resources/17.0.19.10.1/amazon-corretto-17.0.19.10.1-windows-x64-jdk.zip",
9+
"hash": "ab748d9814d99a848916b54b36ae0f1d104493e61a19e1887072b4db9802c6ac"
1010
}
1111
},
12-
"extract_dir": "jdk17.0.18_9",
12+
"extract_dir": "jdk17.0.19_10",
1313
"env_add_path": "bin",
1414
"env_set": {
1515
"JAVA_HOME": "$dir"

‎bucket/corretto21-jdk.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"description": "Amazon Corretto is a no-cost, multiplatform, production-ready distribution of the Open Java Development Kit (OpenJDK)",
33
"homepage": "https://aws.amazon.com/corretto/",
4-
"version": "21.0.10.7.1",
4+
"version": "21.0.11.10.1",
55
"license": "GPL-2.0-only WITH Classpath-exception-2.0",
66
"architecture": {
77
"64bit": {
8-
"url": "https://corretto.aws/downloads/resources/21.0.10.7.1/amazon-corretto-21.0.10.7.1-windows-x64-jdk.zip",
9-
"hash": "ea03f291937e6b32700fa325ec2bf77dcf570f1ace8ef0f01e752d66c035877e"
8+
"url": "https://corretto.aws/downloads/resources/21.0.11.10.1/amazon-corretto-21.0.11.10.1-windows-x64-jdk.zip",
9+
"hash": "5d63fdb5a19393081919afc0daa4ce82a7fadcced569981a995529caed28fb14"
1010
}
1111
},
12-
"extract_dir": "jdk21.0.10_7",
12+
"extract_dir": "jdk21.0.11_10",
1313
"env_add_path": "bin",
1414
"env_set": {
1515
"JAVA_HOME": "$dir"

0 commit comments

Comments
 (0)