Merge branch 'main' into 17093-aspect-ratio-example

.all-contributorsrc

@@ -1587,6 +1587,24 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "Adam-Shea",
+      "name": "Adam Shea",
+      "avatar_url": "https://avatars.githubusercontent.com/u/44814104?v=4",
+      "profile": "https://github.com/Adam-Shea",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "NabeelAyubee",
+      "name": "Md Nabeel Ayubee",
+      "avatar_url": "https://avatars.githubusercontent.com/u/64087875?v=4",
+      "profile": "https://github.com/NabeelAyubee",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "commitConvention": "none"

.github/renovate.json5

@@ -1,24 +1,24 @@
 {
-  extends: [
+  "extends": [
     // https://docs.renovatebot.com/presets-config/#configjs-lib
-    'config:js-lib',
+    "config:js-lib",
 
     // https://docs.renovatebot.com/presets-default/#maintainlockfilesweekly
-    ':maintainLockFilesWeekly',
+    ":maintainLockFilesWeekly",
 
     // https://docs.renovatebot.com/presets-default/#preservesemverranges
-    ':preserveSemverRanges',
+    ":preserveSemverRanges",
 
     // https://docs.renovatebot.com/presets-npm/#npmunpublishsafe
-    'npm:unpublishSafe',
+    "npm:unpublishSafe",
   ],
   "schedule": [
     "after 10pm every weekday",
     "before 5am every weekday",
-    "every weekend"
-  ]
-  vulnerabilityAlerts: {
-    enabled: true,
+    "every weekend",
+  ],
+  "vulnerabilityAlerts": {
+    "enabled": true
   },
-  rebaseWhen: 'never',
+  "rebaseWhen": "never",
 }

.github/workflows/ci.yml

@@ -68,7 +68,9 @@ jobs:
           path: |
             node_modules
             */**/node_modules
-          key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock', 'packages/**/yarn.lock') }}
+          key:
+            ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock',
+            'packages/**/yarn.lock') }}
       - name: Install dependencies
         run: yarn install --immutable --immutable-cache
       - name: Build project
@@ -95,7 +97,9 @@ jobs:
           path: |
             node_modules
             */**/node_modules
-          key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock', 'packages/**/yarn.lock') }}
+          key:
+            ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock',
+            'packages/**/yarn.lock') }}
       - name: Install dependencies
         run: yarn install --immutable --immutable-cache
       - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
@@ -119,8 +123,10 @@ jobs:
 
   vrt-runner:
     strategy:
+      fail-fast: false
       matrix:
-        shard: [1, 2, 3, 4]
+        shardIndex: [1, 2, 3, 4]
+        shardTotal: [4]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
@@ -135,7 +141,9 @@ jobs:
           path: |
             node_modules
             */**/node_modules
-          key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock', 'packages/**/yarn.lock') }}
+          key:
+            ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock',
+            'packages/**/yarn.lock') }}
       - name: Install dependencies
         run: yarn install --immutable --immutable-cache
       - name: Install browsers
@@ -161,15 +169,16 @@ jobs:
           PERCY_TOKEN: c9a21a3fde4fda0a0f822d633426ab26e2ab2c1cba55221d342d4047744c8c24
           PERCY_PARALLEL_TOTAL: 4
         run: |
-          yarn percy exec --parallel -- yarn playwright test --project chromium --grep @vrt --shard="${{ matrix.shard }}/4"
+          yarn percy exec --parallel -- yarn playwright test --project chromium --grep @vrt --shard="${{ matrix.shardIndex }}/${{ matrix.shardTotal }}"
       - name: Stop storybook
         run: kill ${{ steps.storybook.outputs.pid }}
-      - name: Upload test results
-        if: always()
-        uses: actions/upload-artifact@v3
+      - name: Upload blob report to GitHub Actions Artifacts
+        if: ${{ !cancelled() }}
+        uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a #4.3.6
         with:
-          name: playwright-vrt-report
-          path: .playwright
+          name: playwright-vrt-blob-report-${{ matrix.shardIndex }}
+          path: blob-report
+          retention-days: 1
 
   vrt:
     if: ${{ always() }}
@@ -182,8 +191,10 @@ jobs:
 
   avt-runner:
     strategy:
+      fail-fast: false
       matrix:
-        shard: [1, 2, 3, 4]
+        shardIndex: [1, 2, 3, 4]
+        shardTotal: [4]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
@@ -198,7 +209,9 @@ jobs:
           path: |
             node_modules
             */**/node_modules
-          key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock', 'packages/**/yarn.lock') }}
+          key:
+            ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock',
+            'packages/**/yarn.lock') }}
       - name: Install dependencies
         run: yarn install --immutable --immutable-cache
       - name: Install browsers
@@ -221,15 +234,16 @@ jobs:
       - name: Run AVT
         if: github.repository == 'carbon-design-system/carbon'
         run: |
-          yarn playwright test --project chromium --grep @avt --shard="${{ matrix.shard }}/4"
+          yarn playwright test --project chromium --grep @avt --shard="${{ matrix.shardIndex }}/${{ matrix.shardTotal }}"
       - name: Stop storybook
         run: kill ${{ steps.storybook.outputs.pid }}
-      - name: Upload test results
-        if: always()
-        uses: actions/upload-artifact@v3
+      - name: Upload blob report to GitHub Actions Artifacts
+        if: ${{ !cancelled() }}
+        uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a #4.3.6
         with:
-          name: playwright-avt-report
-          path: .playwright
+          name: playwright-avt-blob-report-${{ matrix.shardIndex }}
+          path: blob-report
+          retention-days: 1
 
   avt:
     if: ${{ always() }}
@@ -238,4 +252,67 @@ jobs:
     steps:
       - name: Check AVT Runner job status
         if: ${{ needs.avt-runner.result != 'success' }}
-        run: exit 1
+        run: exit 1
+
+  merge-playwright-reports:
+    # Merge reports after *-runner jobs, even if some shards have failed
+    if: ${{ !cancelled() }}
+    needs: [vrt-runner, avt-runner]
+
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - name: Use Node.js 20.x
+        uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b #v4.0.3
+        with:
+          node-version: '20.x'
+      - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 #v4.0.2
+        if: github.event_name != 'merge_group'
+        id: cache
+        with:
+          path: |
+            node_modules
+            */**/node_modules
+          key:
+            ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock',
+            'packages/**/yarn.lock') }}
+      - name: Install dependencies
+        run: yarn install --immutable --immutable-cache
+
+      - name: Download vrt blob reports from GitHub Actions Artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: all-playwright-vrt-blob-reports
+          pattern: playwright-vrt-blob-report-*
+          merge-multiple: true
+
+      - name: Merge vrt reports into HTML Report
+        run:
+          npx playwright merge-reports --reporter html
+          ./all-playwright-vrt-blob-reports
+
+      - name: Upload vrt HTML report
+        uses: actions/upload-artifact@v4
+        with:
+          name: html-playwright-vrt-report--attempt-${{ github.run_attempt }}
+          path: playwright-vrt-report
+          retention-days: 14
+
+      - name: Download avt blob reports from GitHub Actions Artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: all-playwright-avt-blob-reports
+          pattern: playwright-avt-blob-report-*
+          merge-multiple: true
+
+      - name: Merge avt reports into HTML Report
+        run:
+          npx playwright merge-reports --reporter html
+          ./all-playwright-avt-blob-reports
+
+      - name: Upload avt HTML report
+        uses: actions/upload-artifact@v4
+        with:
+          name: html-playwright-avt-report--attempt-${{ github.run_attempt }}
+          path: playwright-avt-report
+          retention-days: 14

.github/workflows/codeql-analysis.yml

@@ -24,9 +24,9 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@eb055d739abdc2e8de2e5f4ba1a8b246daa779aa # v3.26.0
+        uses: github/codeql-action/init@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # v3.26.5
         with:
           languages: javascript
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@eb055d739abdc2e8de2e5f4ba1a8b246daa779aa # v3.26.0
+        uses: github/codeql-action/analyze@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # v3.26.5

.github/workflows/dco.yml

@@ -16,7 +16,7 @@ jobs:
           (github.event.comment.body == 'recheck' || github.event.comment.body
           == 'I have read the DCO document and I hereby sign the DCO.') ||
           github.event_name == 'pull_request_target'
-        uses: cla-assistant/github-action@9340315624c6e16cef1f2c63bdeb0f0c49c6f474 #v2.4.0
+        uses: cla-assistant/github-action@f41946747f85d28e9a738f4f38dbcc74b69c7e0e # v2.5.1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}

.github/workflows/nightly-release.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   release:
-    runs-on: macos-13
+    runs-on: macos-14
     # Needed as recommended by npm docs on publishing with provenance https://docs.npmjs.com/generating-provenance-statements
     permissions:
       id-token: write

.github/workflows/release.yml

@@ -58,7 +58,7 @@ jobs:
         run: kill ${{ steps.storybook.outputs.pid }}
       - name: Upload test results
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a #4.3.6
         with:
           name: playwright-avt-report
           path: .playwright

.gitignore

@@ -57,6 +57,7 @@ package-lock.json
 
 # Playwright
 .playwright
+blob-report
 
 # Local token
 .env

.nvmrc

@@ -1 +1 @@
-20.14
+20.17