Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from diygod:master #55

Merged
merged 12 commits into from
Sep 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .github/workflows/docker-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,27 +49,27 @@ jobs:
uses: sigstore/cosign-installer@v3

- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Log in to Docker Hub
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}

- name: Log in to the Container registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Extract Docker metadata (ordinary version)
id: meta-ordinary
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: |
${{ secrets.DOCKER_USERNAME }}/rsshub
Expand All @@ -81,7 +81,7 @@ jobs:

- name: Build and push Docker image (ordinary version)
id: build-and-push
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: .
push: true
Expand All @@ -99,7 +99,7 @@ jobs:

- name: Extract Docker metadata (Chromium-bundled version)
id: meta-chromium-bundled
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: |
${{ secrets.DOCKER_USERNAME }}/rsshub
Expand All @@ -111,7 +111,7 @@ jobs:

- name: Build and push Docker image (Chromium-bundled version)
id: build-and-push-chromium
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: .
build-args: PUPPETEER_SKIP_DOWNLOAD=0
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/docker-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,17 @@ jobs:
uses: actions/checkout@v4

- name: Set up Docker Buildx # needed by `cache-from`
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Extract Docker metadata
id: meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: rsshub
flavor: latest=true

- name: Build Docker image
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: .
build-args: PUPPETEER_SKIP_DOWNLOAD=0 # also test bundling Chromium
Expand Down
2 changes: 1 addition & 1 deletion lib/radar.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const toSource = require('tosource');
const { join } = require('path');

// Namespaces that do not require radar.js
const allowNamespace = ['discourse', 'discuz', 'ehentai', 'test'];
const allowNamespace = ['discourse', 'discuz', 'ehentai', 'mail', 'test'];
// Check if a radar.js file is exist under each folder of dirname
for (const dir of fs.readdirSync(dirname)) {
const dirPath = join(dirname, dir);
Expand Down
6 changes: 3 additions & 3 deletions lib/router.js
Original file line number Diff line number Diff line change
Expand Up @@ -351,8 +351,8 @@ router.get('/kmust/job/careers/:type?', lazyloadRouteHandler('./routes/universit
router.get('/kmust/job/jobfairs', lazyloadRouteHandler('./routes/universities/kmust/job/jobfairs'));

// 武汉大学
router.get('/whu/cs/:type', lazyloadRouteHandler('./routes/universities/whu/cs'));
router.get('/whu/news/:type?', lazyloadRouteHandler('./routes/universities/whu/news'));
// router.get('/whu/cs/:type', lazyloadRouteHandler('./routes/universities/whu/cs'));
// router.get('/whu/news/:type?', lazyloadRouteHandler('./routes/universities/whu/news'));

// 井冈山大学
router.get('/jgsu/jwc', lazyloadRouteHandler('./routes/universities/jgsu/jwc'));
Expand Down Expand Up @@ -1199,7 +1199,7 @@ router.get('/latexstudio/home', lazyloadRouteHandler('./routes/latexstudio/home'
router.get('/jskou/:type?', lazyloadRouteHandler('./routes/jskou/index'));

// 邮箱
router.get('/mail/imap/:email', lazyloadRouteHandler('./routes/mail/imap'));
// router.get('/mail/imap/:email/:folder*', lazyloadRouteHandler('./routes/mail/imap'));

// 好队友
router.get('/network360/jobs', lazyloadRouteHandler('./routes/network360/jobs'));
Expand Down
79 changes: 0 additions & 79 deletions lib/routes/mail/imap.js

This file was deleted.

38 changes: 0 additions & 38 deletions lib/routes/universities/whu/cs.js

This file was deleted.

128 changes: 0 additions & 128 deletions lib/routes/universities/whu/news.js

This file was deleted.

Loading