Skip to content

Commit 202a904

Browse files
author
chufan
committed
Merge branch 'next' into feat/add-comment-plugin
2 parents 64bc531 + 5b24dff commit 202a904

File tree

2 files changed

+35
-19
lines changed

2 files changed

+35
-19
lines changed

.github/workflows/CD.yaml

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ jobs:
2626
## 部署到Github-Pages
2727
deploy-github:
2828
name: "部署到Github-Pages"
29+
if: github.repository == '142vip/JavaScriptCollection'
2930
runs-on: macos-latest
3031

3132
steps:
@@ -36,13 +37,23 @@ jobs:
3637
# “最近更新时间” 等 git 日志相关信息,需要拉取全部提交记录
3738
fetch-depth: 0
3839

39-
## 依赖下载完成后,或执行思维导图编译
40-
- name: PNPM Install
41-
uses: pnpm/action-setup@v2
40+
# ## 依赖下载完成后,或执行思维导图编译
41+
# - name: PNPM Install
42+
# uses: pnpm/action-setup@v2
43+
# with:
44+
# version: 7
45+
# run_install: |
46+
# args: [--frozen-lockfile, --registry=https://registry.npmmirror.com]
47+
# 安装Node环境
48+
- name: Install Node.js
49+
uses: actions/setup-node@v3
4250
with:
43-
version: 7
44-
run_install: |
45-
args: [--frozen-lockfile, --registry=https://registry.npmmirror.com]
51+
node-version: 18.18.0
52+
## 淘宝镜像加速
53+
registry-url: 'https://registry.npmmirror.com'
54+
55+
- name: Install Dependencies
56+
run: ./scripts/ci
4657

4758
# 运行构建脚本
4859
- name: Build VuePress Site

.github/workflows/CI.yaml

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
## 代码CI快速集成流水线,lint、fix、build
2+
## 注意: 只在142vip/JavaScriptCollection时执行
23

34

45
name: CI
@@ -23,6 +24,7 @@ jobs:
2324
install-init:
2425
name: "流水线初始化"
2526
runs-on: macos-latest
27+
if: github.repository == '142vip/JavaScriptCollection'
2628
permissions:
2729
actions: read
2830
pull-requests: read
@@ -35,21 +37,23 @@ jobs:
3537
# “最近更新时间” 等 git 日志相关信息,需要拉取全部提交记录
3638
fetch-depth: 0
3739

38-
## 依赖下载完成后,或执行思维导图编译
39-
- name: PNPM Install
40-
uses: pnpm/action-setup@v2
40+
# ## 依赖下载完成后,或执行思维导图编译
41+
# - name: PNPM Install
42+
# uses: pnpm/action-setup@v2
43+
# with:
44+
# version: 7
45+
# run_install: |
46+
# args: [--frozen-lockfile, --registry=https://registry.npmmirror.com]
47+
# 安装Node环境
48+
- name: Install Node.js
49+
uses: actions/setup-node@v3
4150
with:
42-
version: 7
43-
run_install: |
44-
args: [--frozen-lockfile, --registry=https://registry.npmmirror.com]
51+
node-version: 18.18.0
52+
## 淘宝镜像加速
53+
registry-url: 'https://registry.npmmirror.com'
4554

46-
# - name: Install Node.js
47-
# uses: actions/setup-node@v3
48-
# with:
49-
# node-version: 18.18.0
50-
# ## 淘宝镜像加速
51-
# registry-url: 'https://registry.npmmirror.com'
52-
# cache: 'pnpm'
55+
- name: Install Dependencies
56+
run: ./scripts/ci
5357

5458
- name: Cache Dependencies
5559
uses: actions/cache@v3
@@ -60,6 +64,7 @@ jobs:
6064
Base-Build:
6165
name: "基础编译构建"
6266
runs-on: macos-latest
67+
if: github.repository == '142vip/JavaScriptCollection'
6368
needs:
6469
- install-init
6570
steps:

0 commit comments

Comments
 (0)