Skip to content

Conversation

@alanbsmith
Copy link
Member

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.

ahayes91 and others added 2 commits January 22, 2026 11:13
Fixes: #3693 

While this issue is fixed in v14, ideally we would have a fix for it in v13 too for teams that are still transitioning!

[category:Components]
@jaclynjessup jaclynjessup moved this to 👀 In review in Canvas Kit Jan 22, 2026
mannycarrera4 and others added 3 commits January 22, 2026 15:23
Using a global selector for tooltips on the body causes performance issues in chrome.

[category:Components]

Co-authored-by: manuel.carrera <manuel.carrera@workday.com>
@cypress
Copy link

cypress bot commented Jan 22, 2026

Workday/canvas-kit    Run #10096

Run Properties:  status check passed Passed #10096  •  git commit f032b6dc14 ℹ️: Merge 694cc44dd0b72809e91117b9e5a2a64dd6580ebc into 4cedb7bd0f8282b9f4dc566f7b01...
Project Workday/canvas-kit
Branch Review merge/support-into-master
Run status status check passed Passed #10096
Run duration 02m 28s
Commit git commit f032b6dc14 ℹ️: Merge 694cc44dd0b72809e91117b9e5a2a64dd6580ebc into 4cedb7bd0f8282b9f4dc566f7b01...
Committer Alan B Smith
View all properties for this run ↗︎

Test results
Tests that failed  Failures 0
Tests that were flaky  Flaky 1
Tests that did not run due to a developer annotating a test with .skip  Pending 86
Tests that did not run due to a failure in a mocha hook  Skipped 0
Tests that passed  Passing 862
View all changes introduced in this branch ↗︎
UI Coverage  19.4%
  Untested elements 1535  
  Tested elements 367  
Accessibility  99.33%
  Failed rules  6 critical   5 serious   0 moderate   2 minor
  Failed elements 77  

@alanbsmith alanbsmith merged commit 7800750 into master Jan 22, 2026
18 of 20 checks passed
@github-project-automation github-project-automation bot moved this from 👀 In review to ✅ Done in Canvas Kit Jan 22, 2026
@alanbsmith alanbsmith deleted the merge/support-into-master branch January 22, 2026 22:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

Status: ✅ Done

Development

Successfully merging this pull request may close these issues.

4 participants