Skip to content

Commit b0b737c

Browse files
authored
Merge branch 'main' into chore/update-babel-proposals
2 parents b167ca9 + 2820f64 commit b0b737c

File tree

178 files changed

+2347
-2151
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

178 files changed

+2347
-2151
lines changed

.all-contributorsrc

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1587,6 +1587,24 @@
15871587
"contributions": [
15881588
"code"
15891589
]
1590+
},
1591+
{
1592+
"login": "Adam-Shea",
1593+
"name": "Adam Shea",
1594+
"avatar_url": "https://avatars.githubusercontent.com/u/44814104?v=4",
1595+
"profile": "https://github.com/Adam-Shea",
1596+
"contributions": [
1597+
"code"
1598+
]
1599+
},
1600+
{
1601+
"login": "NabeelAyubee",
1602+
"name": "Md Nabeel Ayubee",
1603+
"avatar_url": "https://avatars.githubusercontent.com/u/64087875?v=4",
1604+
"profile": "https://github.com/NabeelAyubee",
1605+
"contributions": [
1606+
"code"
1607+
]
15901608
}
15911609
],
15921610
"commitConvention": "none"

.github/workflows/ci.yml

Lines changed: 96 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,9 @@ jobs:
6868
path: |
6969
node_modules
7070
*/**/node_modules
71-
key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock', 'packages/**/yarn.lock') }}
71+
key:
72+
${{ runner.os }}-yarn-${{ hashFiles('yarn.lock',
73+
'packages/**/yarn.lock') }}
7274
- name: Install dependencies
7375
run: yarn install --immutable --immutable-cache
7476
- name: Build project
@@ -95,7 +97,9 @@ jobs:
9597
path: |
9698
node_modules
9799
*/**/node_modules
98-
key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock', 'packages/**/yarn.lock') }}
100+
key:
101+
${{ runner.os }}-yarn-${{ hashFiles('yarn.lock',
102+
'packages/**/yarn.lock') }}
99103
- name: Install dependencies
100104
run: yarn install --immutable --immutable-cache
101105
- uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
@@ -119,8 +123,10 @@ jobs:
119123

120124
vrt-runner:
121125
strategy:
126+
fail-fast: false
122127
matrix:
123-
shard: [1, 2, 3, 4]
128+
shardIndex: [1, 2, 3, 4]
129+
shardTotal: [4]
124130
runs-on: ubuntu-latest
125131
steps:
126132
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
@@ -135,7 +141,9 @@ jobs:
135141
path: |
136142
node_modules
137143
*/**/node_modules
138-
key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock', 'packages/**/yarn.lock') }}
144+
key:
145+
${{ runner.os }}-yarn-${{ hashFiles('yarn.lock',
146+
'packages/**/yarn.lock') }}
139147
- name: Install dependencies
140148
run: yarn install --immutable --immutable-cache
141149
- name: Install browsers
@@ -161,15 +169,16 @@ jobs:
161169
PERCY_TOKEN: c9a21a3fde4fda0a0f822d633426ab26e2ab2c1cba55221d342d4047744c8c24
162170
PERCY_PARALLEL_TOTAL: 4
163171
run: |
164-
yarn percy exec --parallel -- yarn playwright test --project chromium --grep @vrt --shard="${{ matrix.shard }}/4"
172+
yarn percy exec --parallel -- yarn playwright test --project chromium --grep @vrt --shard="${{ matrix.shardIndex }}/${{ matrix.shardTotal }}"
165173
- name: Stop storybook
166174
run: kill ${{ steps.storybook.outputs.pid }}
167-
- name: Upload test results
168-
if: always()
169-
uses: actions/upload-artifact@v3
175+
- name: Upload blob report to GitHub Actions Artifacts
176+
if: ${{ !cancelled() }}
177+
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a #4.3.6
170178
with:
171-
name: playwright-vrt-report
172-
path: .playwright
179+
name: playwright-vrt-blob-report-${{ matrix.shardIndex }}
180+
path: blob-report
181+
retention-days: 1
173182

174183
vrt:
175184
if: ${{ always() }}
@@ -182,8 +191,10 @@ jobs:
182191

183192
avt-runner:
184193
strategy:
194+
fail-fast: false
185195
matrix:
186-
shard: [1, 2, 3, 4]
196+
shardIndex: [1, 2, 3, 4]
197+
shardTotal: [4]
187198
runs-on: ubuntu-latest
188199
steps:
189200
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
@@ -198,7 +209,9 @@ jobs:
198209
path: |
199210
node_modules
200211
*/**/node_modules
201-
key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock', 'packages/**/yarn.lock') }}
212+
key:
213+
${{ runner.os }}-yarn-${{ hashFiles('yarn.lock',
214+
'packages/**/yarn.lock') }}
202215
- name: Install dependencies
203216
run: yarn install --immutable --immutable-cache
204217
- name: Install browsers
@@ -221,15 +234,16 @@ jobs:
221234
- name: Run AVT
222235
if: github.repository == 'carbon-design-system/carbon'
223236
run: |
224-
yarn playwright test --project chromium --grep @avt --shard="${{ matrix.shard }}/4"
237+
yarn playwright test --project chromium --grep @avt --shard="${{ matrix.shardIndex }}/${{ matrix.shardTotal }}"
225238
- name: Stop storybook
226239
run: kill ${{ steps.storybook.outputs.pid }}
227-
- name: Upload test results
228-
if: always()
229-
uses: actions/upload-artifact@v3
240+
- name: Upload blob report to GitHub Actions Artifacts
241+
if: ${{ !cancelled() }}
242+
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a #4.3.6
230243
with:
231-
name: playwright-avt-report
232-
path: .playwright
244+
name: playwright-avt-blob-report-${{ matrix.shardIndex }}
245+
path: blob-report
246+
retention-days: 1
233247

234248
avt:
235249
if: ${{ always() }}
@@ -238,4 +252,67 @@ jobs:
238252
steps:
239253
- name: Check AVT Runner job status
240254
if: ${{ needs.avt-runner.result != 'success' }}
241-
run: exit 1
255+
run: exit 1
256+
257+
merge-playwright-reports:
258+
# Merge reports after *-runner jobs, even if some shards have failed
259+
if: ${{ !cancelled() }}
260+
needs: [vrt-runner, avt-runner]
261+
262+
runs-on: ubuntu-latest
263+
steps:
264+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
265+
- name: Use Node.js 20.x
266+
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b #v4.0.3
267+
with:
268+
node-version: '20.x'
269+
- uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 #v4.0.2
270+
if: github.event_name != 'merge_group'
271+
id: cache
272+
with:
273+
path: |
274+
node_modules
275+
*/**/node_modules
276+
key:
277+
${{ runner.os }}-yarn-${{ hashFiles('yarn.lock',
278+
'packages/**/yarn.lock') }}
279+
- name: Install dependencies
280+
run: yarn install --immutable --immutable-cache
281+
282+
- name: Download vrt blob reports from GitHub Actions Artifacts
283+
uses: actions/download-artifact@v4
284+
with:
285+
path: all-playwright-vrt-blob-reports
286+
pattern: playwright-vrt-blob-report-*
287+
merge-multiple: true
288+
289+
- name: Merge vrt reports into HTML Report
290+
run:
291+
npx playwright merge-reports --reporter html
292+
./all-playwright-vrt-blob-reports
293+
294+
- name: Upload vrt HTML report
295+
uses: actions/upload-artifact@v4
296+
with:
297+
name: html-playwright-vrt-report--attempt-${{ github.run_attempt }}
298+
path: playwright-vrt-report
299+
retention-days: 14
300+
301+
- name: Download avt blob reports from GitHub Actions Artifacts
302+
uses: actions/download-artifact@v4
303+
with:
304+
path: all-playwright-avt-blob-reports
305+
pattern: playwright-avt-blob-report-*
306+
merge-multiple: true
307+
308+
- name: Merge avt reports into HTML Report
309+
run:
310+
npx playwright merge-reports --reporter html
311+
./all-playwright-avt-blob-reports
312+
313+
- name: Upload avt HTML report
314+
uses: actions/upload-artifact@v4
315+
with:
316+
name: html-playwright-avt-report--attempt-${{ github.run_attempt }}
317+
path: playwright-avt-report
318+
retention-days: 14

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ jobs:
2424

2525
# Initializes the CodeQL tools for scanning.
2626
- name: Initialize CodeQL
27-
uses: github/codeql-action/init@eb055d739abdc2e8de2e5f4ba1a8b246daa779aa # v3.26.0
27+
uses: github/codeql-action/init@f0f3afee809481da311ca3a6ff1ff51d81dbeb24 # v3.26.4
2828
with:
2929
languages: javascript
3030

3131
- name: Perform CodeQL Analysis
32-
uses: github/codeql-action/analyze@eb055d739abdc2e8de2e5f4ba1a8b246daa779aa # v3.26.0
32+
uses: github/codeql-action/analyze@f0f3afee809481da311ca3a6ff1ff51d81dbeb24 # v3.26.4

.github/workflows/dco.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
(github.event.comment.body == 'recheck' || github.event.comment.body
1717
== 'I have read the DCO document and I hereby sign the DCO.') ||
1818
github.event_name == 'pull_request_target'
19-
uses: cla-assistant/github-action@9340315624c6e16cef1f2c63bdeb0f0c49c6f474 #v2.4.0
19+
uses: cla-assistant/github-action@f41946747f85d28e9a738f4f38dbcc74b69c7e0e # v2.5.1
2020
env:
2121
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2222
PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}

.github/workflows/nightly-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
release:
10-
runs-on: macos-13
10+
runs-on: macos-14
1111
# Needed as recommended by npm docs on publishing with provenance https://docs.npmjs.com/generating-provenance-statements
1212
permissions:
1313
id-token: write

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
run: kill ${{ steps.storybook.outputs.pid }}
5959
- name: Upload test results
6060
if: always()
61-
uses: actions/upload-artifact@v3
61+
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a #4.3.6
6262
with:
6363
name: playwright-avt-report
6464
path: .playwright

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ package-lock.json
5757

5858
# Playwright
5959
.playwright
60+
blob-report
6061

6162
# Local token
6263
.env

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20.14
1+
20.17
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)