chore: Merge support into master

Workday / canvas-kit

Development kits to implement UI following the Workday Canvas Design System (https://canvas.workday.com/). See our Component Storybook -

https://workday.github.io/canvas-kit/

Apache License 2.0

301 stars 221 forks source link

chore: Merge support into master #3022

Closed alanbsmith closed 2 weeks ago

alanbsmith commented 2 weeks ago

This pull request was automatically created by an automated forward-merge job. The automated job failed automated checks and must be resolved manually. Reasons for failure may include:

Merge conflicts that cannot be automatically resolved
A merge resulted in check failures
- Lint or type errors
- Test failures
- Unexpected visual changes The pull request should inform you of merge conflicts before you start if any.
  1. Run the following commands in your terminal. If this succeeds, skip step 2. The last command will run a script that tries to merge and resolve conflicts automatically.
```
git branch -D merge/support-into-master || true
git fetch upstream
git checkout --track upstream/merge/support-into-master
git pull upstream merge/support-into-master -f
git pull upstream support
node utils/forward-merge.js
```
  2. If the previous step succeeded, skip to step 4.
  3. Resolve conflicts manually. Then run the following.
```
git add .
git commit -m "chore: Merge support into master"
```
  4. Push the merge commit back to the pull request
```
git push upstream merge/support-into-master
```
    If there were no merge conflicts, the forward-merge job failed because of a test failure. You can wait for the pull request to give errors, or you can check the logs for failures. You'll have to update code to fix errors. This pull request will be merged using the merge strategy instead of the squash strategy. This means any commit in the log will show in the branch's history. Any commit you make should amend the merge commit. Use the following command:
```
git commit --amend --no-edit
```
    You must then force-push the branch and the CI will rerun verification. Use the automerge label like normal and the CI will pick the correct merge strategy.

cypress[bot] commented 2 weeks ago

Workday/canvas-kit Run #7967

Run Properties: Passed #7967 • 7b3ec25248 ℹ️: Merge fff14ce4d897e0ef75d4f4e78ab5e0358e0a7300 into bc611c167b5746d576a5b1943ff0...

Project	`Workday/canvas-kit`
Branch Review	`merge/support-into-master`
Run status	`Passed #7967`
Run duration	`03m 45s`
Commit	`7b3ec25248 ℹ️: Merge fff14ce4d897e0ef75d4f4e78ab5e0358e0a7300 into bc611c167b5746d576a5b1943ff0...`
Committer	`Alan B Smith`
View all properties for this run ↗︎

Test results
Failures	`0`
Flaky	`30`
Pending	`24`
Skipped	`0`
Passing	`1093`
View all changes introduced in this branch ↗︎

UI Coverage `21.89%`
Untested elements	`1625`
Tested elements	`453`

Accessibility `99.18%`
Failed rules	`5 critical` `5 serious` `0 moderate` `2 minor`
Failed elements	`181`