Skip to content

Commit 73c4c91

Browse files
Oreoxmtti-chi-bot
authored andcommitted
This is an automated cherry-pick of #3145
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
1 parent ba0582f commit 73c4c91

7 files changed

Lines changed: 404 additions & 3 deletions

File tree

.github/workflows/ci.yaml

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,15 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Check out
15+
<<<<<<< HEAD
1516
uses: actions/checkout@v3
1617
- name: Set up node
1718
uses: actions/setup-node@v3
19+
=======
20+
uses: actions/checkout@v6
21+
- name: Set up node
22+
uses: actions/setup-node@v6
23+
>>>>>>> fcf91518 (ci: update actions (#3145))
1824
with:
1925
node-version: '16'
2026
- name: Add remote
@@ -29,9 +35,15 @@ jobs:
2935
runs-on: ubuntu-latest
3036
steps:
3137
- name: Check out
38+
<<<<<<< HEAD
3239
uses: actions/checkout@v3
3340
- name: Set up node
3441
uses: actions/setup-node@v3
42+
=======
43+
uses: actions/checkout@v6
44+
- name: Set up node
45+
uses: actions/setup-node@v6
46+
>>>>>>> fcf91518 (ci: update actions (#3145))
3547
with:
3648
node-version: '16'
3749
- name: Add remote
@@ -46,9 +58,15 @@ jobs:
4658
runs-on: ubuntu-latest
4759
steps:
4860
- name: Check out
61+
<<<<<<< HEAD
4962
uses: actions/checkout@v3
5063
- name: Set up node
5164
uses: actions/setup-node@v3
65+
=======
66+
uses: actions/checkout@v6
67+
- name: Set up node
68+
uses: actions/setup-node@v6
69+
>>>>>>> fcf91518 (ci: update actions (#3145))
5270
with:
5371
node-version: '16'
5472
- name: Add remote
@@ -64,9 +82,15 @@ jobs:
6482
runs-on: ubuntu-latest
6583
steps:
6684
- name: Check out
85+
<<<<<<< HEAD
6786
uses: actions/checkout@v3
6887
- name: Set up node
6988
uses: actions/setup-node@v3
89+
=======
90+
uses: actions/checkout@v6
91+
- name: Set up node
92+
uses: actions/setup-node@v6
93+
>>>>>>> fcf91518 (ci: update actions (#3145))
7094
with:
7195
node-version: '16'
7296
- name: Verify internal links
@@ -75,9 +99,15 @@ jobs:
7599
runs-on: ubuntu-latest
76100
steps:
77101
- name: Check out
102+
<<<<<<< HEAD
78103
uses: actions/checkout@v3
79104
- name: Set up node
80105
uses: actions/setup-node@v3
106+
=======
107+
uses: actions/checkout@v6
108+
- name: Set up node
109+
uses: actions/setup-node@v6
110+
>>>>>>> fcf91518 (ci: update actions (#3145))
81111
with:
82112
node-version: '16'
83113
- name: Verify internal link anchors
@@ -86,9 +116,15 @@ jobs:
86116
runs-on: ubuntu-latest
87117
steps:
88118
- name: Check out
119+
<<<<<<< HEAD
89120
uses: actions/checkout@v3
90121
- name: Set up node
91122
uses: actions/setup-node@v3
123+
=======
124+
uses: actions/checkout@v6
125+
- name: Set up node
126+
uses: actions/setup-node@v6
127+
>>>>>>> fcf91518 (ci: update actions (#3145))
92128
with:
93129
node-version: '16'
94130
- name: Add remote
@@ -103,9 +139,15 @@ jobs:
103139
runs-on: ubuntu-latest
104140
steps:
105141
- name: Check out
142+
<<<<<<< HEAD
106143
uses: actions/checkout@v3
107144
- name: Set up node
108145
uses: actions/setup-node@v3
146+
=======
147+
uses: actions/checkout@v6
148+
- name: Set up node
149+
uses: actions/setup-node@v6
150+
>>>>>>> fcf91518 (ci: update actions (#3145))
109151
with:
110152
node-version: '16'
111153
- name: Add remote
@@ -120,9 +162,15 @@ jobs:
120162
runs-on: ubuntu-latest
121163
steps:
122164
- name: Check out
165+
<<<<<<< HEAD
123166
uses: actions/checkout@v3
124167
- name: Set up node
125168
uses: actions/setup-node@v3
169+
=======
170+
uses: actions/checkout@v6
171+
- name: Set up node
172+
uses: actions/setup-node@v6
173+
>>>>>>> fcf91518 (ci: update actions (#3145))
126174
with:
127175
node-version: '16'
128176
- name: Add remote

0 commit comments

Comments
 (0)