Skip to content
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

chore: Merge prerelease/minor into prerelease/major #2897

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/prerelease/minor-into-prerelease/major || true
    git fetch upstream
    git checkout --track upstream/merge/prerelease/minor-into-prerelease/major
    git pull upstream merge/prerelease/minor-into-prerelease/major -f
    git pull upstream prerelease/minor
    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 prerelease/minor into prerelease/major"
    
  4. Push the merge commit back to the pull request
    git push upstream merge/prerelease/minor-into-prerelease/major
    

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.

wooksauce and others added 8 commits August 29, 2024 14:15
Fixes: #701 

Set `role`, `aria-label`, and `aria-selected` to provide better accessibility when user is interacting with color swatches

[category:Accessibility]

Co-authored-by: Kiwook Kwon <[email protected]>
#2906)

Fixes: #2905  

This fixes a TS error in buttons that wouldn't allow the update of the focusRing styles through the colors prop. Also, deprecated the use of focusRing within focus in the colors prop on buttons and added support for boxShadowInner and boxShadowOuter within focus in colors prop.

[category:Components]

Release Note:
Deprecated the use of focusRing within focus in the colors prop on buttons as this does not work with our current styling methods. Added support for boxShadowInner and boxShadowOuter within focus in colors prop.
Copy link

cypress bot commented Sep 10, 2024

Workday/canvas-kit    Run #7688

Run Properties:  status check passed Passed #7688  •  git commit bd7dccb284 ℹ️: Merge b4d0dc5d67c7627f7cd91861a07fb82da293ee50 into f1f40e7e5c1dcffc6b0ea3d368b0...
Project Workday/canvas-kit
Branch Review merge/prerelease/minor-into-prerelease/major
Run status status check passed Passed #7688
Run duration 03m 22s
Commit git commit bd7dccb284 ℹ️: Merge b4d0dc5d67c7627f7cd91861a07fb82da293ee50 into f1f40e7e5c1dcffc6b0ea3d368b0...
Committer Alan B Smith
View all properties for this run ↗︎

Test results
Tests that failed  Failures 0
Tests that were flaky  Flaky 14
Tests that did not run due to a developer annotating a test with .skip  Pending 16
Tests that did not run due to a failure in a mocha hook  Skipped 0
Tests that passed  Passing 854
View all changes introduced in this branch ↗︎
UI Coverage  21.18%
  Untested elements 1818  
  Tested elements 486  
Accessibility  99.18%
  Failed rules  5 critical   5 serious   0 moderate   2 minor
  Failed elements 228  

@alanbsmith alanbsmith merged commit 3f613f7 into prerelease/major Sep 10, 2024
18 of 20 checks passed
@alanbsmith alanbsmith deleted the merge/prerelease/minor-into-prerelease/major branch September 10, 2024 17:40
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.

5 participants