Skip to content

Commit 803bacf

Browse files
dzx-dzxdzx-dzx
authored
Merge branch 'master' into reuters-headers
2 parents 5915aab + db1d71a commit 803bacf

1,531 files changed

Lines changed: 12872 additions & 8717 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.

‎.devcontainer/devcontainer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// https://github.com/devcontainers/images/blob/v0.4.19/src/typescript-node/.devcontainer/devcontainer.json
33
{
44
"name": "Node.js & TypeScript",
5-
"image": "mcr.microsoft.com/devcontainers/typescript-node:24-bookworm",
5+
"image": "mcr.microsoft.com/devcontainers/typescript-node:24-trixie",
66
"features": {
77
"ghcr.io/devcontainers/features/docker-in-docker": {
88
"version": "latest"
@@ -40,7 +40,7 @@
4040
}
4141
},
4242

43-
"onCreateCommand": "sudo apt-get update && export DEBIAN_FRONTEND=noninteractive && sudo apt-get -y install --no-install-recommends ca-certificates fonts-liberation libasound2 libatk-bridge2.0-0 libatk1.0-0 libatspi2.0-0 libcairo2 libcups2 libdbus-1-3 libexpat1 libgbm1 libglib2.0-0 libnspr4 libnss3 libpango-1.0-0 libx11-6 libxcb1 libxcomposite1 libxdamage1 libxext6 libxfixes3 libxkbcommon0 libxrandr2 wget xdg-utils redis-server default-jre-headless && sudo apt-get autoremove -y && sudo apt-get clean -y && sudo rm -rf /var/lib/apt/lists/*",
43+
"onCreateCommand": "sudo apt-get update && export DEBIAN_FRONTEND=noninteractive && sudo apt-get -y install --no-install-recommends ca-certificates fonts-liberation libasound2t64 libatk-bridge2.0-0t64 libatk1.0-0t64 libatspi2.0-0t64 libcairo2 libcups2t64 libdbus-1-3 libexpat1 libgbm1 libglib2.0-0t64 libnspr4 libnss3 libpango-1.0-0 libx11-6 libxcb1 libxcomposite1 libxdamage1 libxext6 libxfixes3 libxkbcommon0 libxrandr2 wget xdg-utils redis-server default-jre-headless && sudo apt-get autoremove -y && sudo apt-get clean -y && sudo rm -rf /var/lib/apt/lists/*",
4444

4545
"updateContentCommand": "export JAVA_HOME=/usr/lib/jvm/default-java && pnpm config set store-dir ~/.local/share/pnpm/store && pnpm i && pnpm rb && pnpx rebrowser-puppeteer browsers install chrome",
4646

‎.github/dependabot.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,15 @@ updates:
1010
- dependencies
1111
ignore:
1212
# pin to version before it is sold to potential suspicious party
13-
# https://github.com/goofychris/art-template/issues/660 the issue created from original author stating v4.13.3
13+
# https://github.com/goofychris/art-template/issues/660 the issue created from original author stating v4.13.3 (March, 2025)
1414
# contains suspicious code and related issues (#658, #659) were deleted
1515
# related:
1616
# https://github.com/fastify/point-of-view/issues/463 https://github.com/fastify/point-of-view/pull/461#issuecomment-2718888986
1717
# https://github.com/cnpm/bug-versions/pull/266 https://github.com/cnpm/cnpmcore/issues/777
1818
# https://github.com/yoimiya-kokomi/Miao-Yunzai/pull/515 https://github.com/zhangfisher/flex-tools/commit/09b565dfe6e2932bb829613ddbe09f6d0acbccd4
19+
# v4.13.5, v4.13.6 (May, 2026)
20+
# https://web.archive.org/web/20260521024725/https://github.com/goofychris/art-template/issues/665
21+
# https://safedep.io/art-template-npm-supply-chain-compromise/ https://github.com/ossf/malicious-packages/pull/1265
1922
- dependency-name: art-template
2023
versions: ['>=4.13.3']
2124
groups:

‎.github/workflows/build-assets.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ jobs:
1818
contents: write
1919
steps:
2020
- name: Checkout
21-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
21+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
2222
- name: Install pnpm
23-
uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
23+
uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
2424
- name: Use Node.js Active LTS
2525
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
2626
with:
@@ -51,7 +51,7 @@ jobs:
5151
if: ${{ env.DOCS_API_TOKEN != '' }}
5252
run: echo "defined=true" >> $GITHUB_OUTPUT
5353
- name: Checkout docs
54-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
54+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
5555
if: steps.check-docs-env.outputs.defined == 'true'
5656
with:
5757
repository: 'RSSNext/rsshub-docs'

‎.github/workflows/codeql.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848

4949
steps:
5050
- name: Checkout repository
51-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
51+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
5252

5353
# Initializes the CodeQL tools for scanning.
5454
# TODO: use hash pinning when https://github.com/dependabot/dependabot-core/pull/13007 pass

‎.github/workflows/comment-on-issue.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ jobs:
2626
outputs:
2727
closed: ${{ steps.check.outputs.closed }}
2828
steps:
29-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
30-
- uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
29+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
30+
- uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
3131
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
3232
with:
3333
node-version: lts/*
@@ -60,8 +60,8 @@ jobs:
6060
(needs.checkIssue.result == 'success' || needs.checkIssue.result == 'skipped') &&
6161
needs.checkIssue.outputs.closed != 'true'
6262
steps:
63-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
64-
- uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
63+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
64+
- uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
6565
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
6666
with:
6767
node-version: lts/*

‎.github/workflows/dependabot-fork.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
timeout-minutes: 5
1111
steps:
1212
- name: Checkout
13-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
13+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
1414

1515
- name: Comment Dependabot PR
1616
uses: thollander/actions-comment-pull-request@24bffb9b452ba05a4f3f77933840a6a841d1b32b # v3.0.1

‎.github/workflows/docker-release.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
6262
6363
- name: Checkout
64-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
64+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
6565

6666
- name: Extract repository name
6767
id: repo-name
@@ -71,24 +71,24 @@ jobs:
7171
echo "repo-name=$REPO_NAME_LOWER" >> "$GITHUB_OUTPUT"
7272
7373
- name: Set up Docker Buildx
74-
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
74+
uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0
7575

7676
- name: Log in to Docker Hub
77-
uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
77+
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
7878
with:
7979
username: ${{ vars.DOCKER_USERNAME }}
8080
password: ${{ secrets.DOCKER_PASSWORD }}
8181

8282
- name: Log in to the Container registry
83-
uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
83+
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
8484
with:
8585
registry: ghcr.io
8686
username: ${{ github.actor }}
8787
password: ${{ secrets.GITHUB_TOKEN }}
8888

8989
- name: Extract Docker metadata (ordinary version)
9090
id: meta-ordinary
91-
uses: docker/metadata-action@030e881283bb7a6894de51c315a6bfe6a94e05cf # v6.0.0
91+
uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6.1.0
9292
with:
9393
images: |
9494
${{ vars.DOCKER_USERNAME }}/${{ steps.repo-name.outputs.repo-name }}
@@ -141,7 +141,7 @@ jobs:
141141

142142
- name: Extract Docker metadata (Chromium-bundled version)
143143
id: meta-chromium-bundled
144-
uses: docker/metadata-action@030e881283bb7a6894de51c315a6bfe6a94e05cf # v6.0.0
144+
uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6.1.0
145145
with:
146146
images: |
147147
${{ vars.DOCKER_USERNAME }}/${{ steps.repo-name.outputs.repo-name }}
@@ -204,16 +204,16 @@ jobs:
204204
id-token: write
205205
steps:
206206
- name: Set up Docker Buildx
207-
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
207+
uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0
208208

209209
- name: Log in to Docker Hub
210-
uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
210+
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
211211
with:
212212
username: ${{ vars.DOCKER_USERNAME }}
213213
password: ${{ secrets.DOCKER_PASSWORD }}
214214

215215
- name: Log in to the Container registry
216-
uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
216+
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
217217
with:
218218
registry: ghcr.io
219219
username: ${{ github.actor }}
@@ -228,7 +228,7 @@ jobs:
228228

229229
- name: Extract Docker metadata (ordinary version)
230230
id: meta-ordinary-merge
231-
uses: docker/metadata-action@030e881283bb7a6894de51c315a6bfe6a94e05cf # v6.0.0
231+
uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6.1.0
232232
with:
233233
images: |
234234
${{ vars.DOCKER_USERNAME }}/${{ needs.release.outputs.repo-name }}
@@ -254,7 +254,7 @@ jobs:
254254

255255
- name: Extract Docker metadata (Chromium-bundled version)
256256
id: meta-chromium-bundled-merge
257-
uses: docker/metadata-action@030e881283bb7a6894de51c315a6bfe6a94e05cf # v6.0.0
257+
uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6.1.0
258258
with:
259259
images: |
260260
${{ vars.DOCKER_USERNAME }}/${{ needs.release.outputs.repo-name }}
@@ -277,7 +277,7 @@ jobs:
277277
if: needs.check-env.outputs.check-docker == 'true'
278278
timeout-minutes: 5
279279
steps:
280-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
280+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
281281

282282
- name: Docker Hub Description
283283
uses: peter-evans/dockerhub-description@1b9a80c056b620d92cedb9d9b5a223409c68ddfa # v5.0.0

‎.github/workflows/docker-test-cont.yml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@ jobs:
1111
runs-on: ubuntu-latest
1212
permissions:
1313
pull-requests: write
14+
actions: read
1415
if: ${{ github.event.workflow_run.conclusion == 'success' }} # skip if unsuccessful
1516
steps:
16-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
17+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
1718

1819
# https://github.com/orgs/community/discussions/25220#discussioncomment-11316244
1920
- name: Search the PR that triggered this workflow
@@ -42,7 +43,7 @@ jobs:
4243
env:
4344
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4445

45-
- uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
46+
- uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
4647

4748
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
4849
with:
@@ -70,12 +71,12 @@ jobs:
7071
7172
- name: Fetch Docker image
7273
if: (env.TEST_CONTINUE)
73-
uses: dawidd6/action-download-artifact@b6e2e70617bc3265edd6dab6c906732b2f1ae151 # v21
74+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
7475
with:
75-
workflow: ${{ github.event.workflow_run.workflow_id }}
76-
run_id: ${{ github.event.workflow_run.id }}
77-
name: docker-image
76+
run-id: ${{ github.event.workflow_run.id }}
77+
name: rsshub.tar.zst
7878
path: ../artifacts-${{ github.run_id }}
79+
github-token: ${{ secrets.GITHUB_TOKEN }}
7980

8081
- name: Import Docker image and set up Docker container
8182
if: (env.TEST_CONTINUE)

‎.github/workflows/docker-test.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ jobs:
2727
timeout-minutes: 10
2828
steps:
2929
- name: Checkout
30-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
30+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
3131

3232
- name: Set up Docker Buildx # needed by `cache-from`
33-
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
33+
uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0
3434

3535
- name: Extract Docker metadata
3636
id: meta
37-
uses: docker/metadata-action@030e881283bb7a6894de51c315a6bfe6a94e05cf # v6.0.0
37+
uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6.1.0
3838
with:
3939
images: rsshub
4040
flavor: latest=true
@@ -75,6 +75,6 @@ jobs:
7575
- name: Upload Docker image
7676
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
7777
with:
78-
name: docker-image
78+
archive: false
7979
path: rsshub.tar.zst
8080
retention-days: 1

‎.github/workflows/format.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ jobs:
1414
timeout-minutes: 15
1515

1616
steps:
17-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
18-
- uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
17+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
18+
- uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
1919
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
2020
with:
2121
node-version: lts/*

0 commit comments

Comments
 (0)