Skip to content

Commit 5fe2bba

Browse files
Copilothuangyiirene
andcommitted
Move merge driver configuration after pnpm installation
Co-authored-by: huangyiirene <[email protected]>
1 parent 164a93c commit 5fe2bba

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

.github/workflows/deploy-docs.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ jobs:
2626
with:
2727
fetch-depth: 0
2828

29+
- name: Install pnpm
30+
uses: pnpm/action-setup@v3
31+
with:
32+
version: 9
33+
2934
- name: Configure Git Merge Driver for pnpm-lock.yaml
3035
run: |
3136
# Configure custom merge driver for pnpm-lock.yaml
@@ -36,11 +41,6 @@ jobs:
3641
# Apply merge driver (CI-only, doesn't affect repository)
3742
echo "pnpm-lock.yaml merge=pnpm-merge" >> .git/info/attributes
3843
39-
- name: Install pnpm
40-
uses: pnpm/action-setup@v3
41-
with:
42-
version: 9
43-
4444
- name: Setup Node
4545
uses: actions/setup-node@v4
4646
with:

.github/workflows/release.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@ jobs:
1616
- name: Checkout Repo
1717
uses: actions/checkout@v4
1818

19+
- name: Install pnpm
20+
uses: pnpm/action-setup@v3
21+
with:
22+
version: 9
23+
1924
- name: Configure Git Merge Driver for pnpm-lock.yaml
2025
run: |
2126
# Configure custom merge driver for pnpm-lock.yaml
@@ -26,11 +31,6 @@ jobs:
2631
# Apply merge driver (CI-only, doesn't affect repository)
2732
echo "pnpm-lock.yaml merge=pnpm-merge" >> .git/info/attributes
2833
29-
- name: Install pnpm
30-
uses: pnpm/action-setup@v3
31-
with:
32-
version: 9
33-
3434
- name: Setup Node.js 20.x
3535
uses: actions/setup-node@v4
3636
with:

.github/workflows/test.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@ jobs:
1414
- name: Checkout Repo
1515
uses: actions/checkout@v4
1616

17+
- name: Install pnpm
18+
uses: pnpm/action-setup@v3
19+
with:
20+
version: 9
21+
1722
- name: Configure Git Merge Driver for pnpm-lock.yaml
1823
run: |
1924
# Configure custom merge driver for pnpm-lock.yaml
@@ -24,11 +29,6 @@ jobs:
2429
# Apply merge driver (CI-only, doesn't affect repository)
2530
echo "pnpm-lock.yaml merge=pnpm-merge" >> .git/info/attributes
2631
27-
- name: Install pnpm
28-
uses: pnpm/action-setup@v3
29-
with:
30-
version: 9
31-
3232
- name: Setup Node.js 20.x
3333
uses: actions/setup-node@v4
3434
with:

0 commit comments

Comments
 (0)