From e9c1c7504acf9cf0ae6856aea621ecd2ee3fa675 Mon Sep 17 00:00:00 2001 From: Shigma Date: Sat, 27 Jan 2024 14:16:04 +0800 Subject: [PATCH 1/3] bump versions --- .github/workflows/deploy.yml | 7 ++++++- package.json | 6 +++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index c63f12b2d6f4..0b048dba384f 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -49,6 +49,7 @@ jobs: DEPLOY_BASE: /dist-docs/ - name: Deploy (koishi-plugin-docs) + if: ${{ github.repository == 'koishijs/docs' && github.ref == 'refs/heads/main' }} uses: peaceiris/actions-gh-pages@v3 with: github_token: ${{ secrets.WORKFLOW_TOKEN }} @@ -59,6 +60,7 @@ jobs: commit_message: '[skip ci] deploy' - name: Sync (koishi-plugin-docs) + if: ${{ github.repository == 'koishijs/docs' && github.ref == 'refs/heads/main' }} run: > curl -L -X POST @@ -68,6 +70,7 @@ jobs: -d '{"ref":"main"}' - name: Build + if: ${{ github.repository == 'koishijs/docs' && github.ref == 'refs/heads/main' }} run: yarn build env: MEILISEARCH_HOST: ${{ secrets.MEILISEARCH_HOST }} @@ -75,10 +78,12 @@ jobs: MEILISEARCH_WRITE_KEY: ${{ secrets.MEILISEARCH_WRITE_KEY }} - name: Deploy + if: ${{ github.repository == 'koishijs/docs' && github.ref == 'refs/heads/main' }} uses: peaceiris/actions-gh-pages@v3 with: github_token: ${{ secrets.WORKFLOW_TOKEN }} - publish_branch: dist + external_repository: koishi-bot/koishi + publish_branch: pages publish_dir: .vitepress/dist force_orphan: true enable_jekyll: true diff --git a/package.json b/package.json index 858dddf57ef2..bcf7dd80cbb5 100644 --- a/package.json +++ b/package.json @@ -14,8 +14,8 @@ "devDependencies": { "@cordisjs/vitepress": "^3.2.4", "@intlify/unplugin-vue-i18n": "^1.5.0", - "@koishijs/components": "^1.5.7", - "@koishijs/core": "^4.16.6", + "@koishijs/components": "^1.5.8", + "@koishijs/core": "^4.16.7", "@koishijs/dns": "^1.0.1", "@koishijs/market": "^4.2.3", "@koishijs/registry": "^7.0.1", @@ -25,7 +25,7 @@ "cross-env": "^7.0.3", "element-plus": "2.4.0", "esbuild-register": "^3.5.0", - "koishi": "^4.16.6", + "koishi": "^4.16.7", "markdown-it-mathjax3": "^4.3.2", "marked-vue": "^1.3.0", "typescript": "^5.3.2", From 3d1e9b7b491f3da8a57c0e6b45ec689cab4429e4 Mon Sep 17 00:00:00 2001 From: 42 <37006258+MirrorCY@users.noreply.github.com> Date: Sat, 27 Jan 2024 14:24:49 +0800 Subject: [PATCH 2/3] hello 2024 --- .vitepress/theme/layouts/home/slide4.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vitepress/theme/layouts/home/slide4.vue b/.vitepress/theme/layouts/home/slide4.vue index 926f4ae13d93..ef45e447c717 100644 --- a/.vitepress/theme/layouts/home/slide4.vue +++ b/.vitepress/theme/layouts/home/slide4.vue @@ -12,7 +12,7 @@ From 09255bb64aac9247be04a67b45e025f5deb511a2 Mon Sep 17 00:00:00 2001 From: 42 <37006258+MirrorCY@users.noreply.github.com> Date: Sat, 27 Jan 2024 16:40:58 +0800 Subject: [PATCH 3/3] Update .vitepress/theme/layouts/home/slide4.vue Co-authored-by: Shigma --- .vitepress/theme/layouts/home/slide4.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vitepress/theme/layouts/home/slide4.vue b/.vitepress/theme/layouts/home/slide4.vue index ef45e447c717..2e0ebd4127df 100644 --- a/.vitepress/theme/layouts/home/slide4.vue +++ b/.vitepress/theme/layouts/home/slide4.vue @@ -12,7 +12,7 @@