Skip to content

chore: Merge support into master #3310

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 27, 2025
Merged

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.

NicholasBoll and others added 2 commits May 27, 2025 09:01
…3309)

Fixes: #3296

`MultiSelect.Input` and `MultiSelect.SearchInput` now handle the `error ` prop. Added error story and state table.

[category:Components]

Co-authored-by: @mannycarrera4 <[email protected]>
@alanbsmith alanbsmith requested a review from NicholasBoll May 27, 2025 15:11
@jaclynjessup jaclynjessup moved this to 👀 In review in Canvas Kit May 27, 2025
Copy link

cypress bot commented May 27, 2025

Workday/canvas-kit    Run #8867

Run Properties:  status check passed Passed #8867  •  git commit d0cdd20e2c ℹ️: Merge a2bd35b2bb435e702b2a10393e2271f1fd89335f into 885784bd65fe9a445b16d7b7ac21...
Project Workday/canvas-kit
Branch Review merge/support-into-master
Run status status check passed Passed #8867
Run duration 02m 48s
Commit git commit d0cdd20e2c ℹ️: Merge a2bd35b2bb435e702b2a10393e2271f1fd89335f into 885784bd65fe9a445b16d7b7ac21...
Committer Alan B Smith
View all properties for this run ↗︎

Test results
Tests that failed  Failures 0
Tests that were flaky  Flaky 0
Tests that did not run due to a developer annotating a test with .skip  Pending 21
Tests that did not run due to a failure in a mocha hook  Skipped 0
Tests that passed  Passing 936
View all changes introduced in this branch ↗︎
UI Coverage  21.36%
  Untested elements 1522  
  Tested elements 411  
Accessibility  99.28%
  Failed rules  6 critical   5 serious   0 moderate   2 minor
  Failed elements 98  

@alanbsmith alanbsmith disabled auto-merge May 27, 2025 15:36
@alanbsmith alanbsmith enabled auto-merge May 27, 2025 15:36
@alanbsmith alanbsmith merged commit 58a4a0d into master May 27, 2025
18 of 19 checks passed
@alanbsmith alanbsmith deleted the merge/support-into-master branch May 27, 2025 15:56
@github-project-automation github-project-automation bot moved this from 👀 In review to ✅ Done in Canvas Kit May 27, 2025
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.

3 participants