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 support into master #2861

Merged
merged 3 commits into from
Aug 5, 2024
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 August 5, 2024 10:17
Fixes 2860.  `aria-selected` for combobox menu items. The cursor was used to determine `aria-selected` instead of the selected item. This changes the visuals of the selected vs focus state, but that issue is covered in #2828.

[category:Components]

Release Note:
This change fixes `aria-selected` in `Combobox.Menu.Item` components, but this does change the visuals of what is considered "selected". If you have any visual tests that have a screenshot of a selected state, the visual regression will have to be updated. The same is true for DOM-based snapshot tests. `aria-selected="true"` will now be added when an item is selected and not just when the virtual cursor is on the item. If your snapshot captures this DOM state, the snapshot will have to be updated.
@alanbsmith alanbsmith requested a review from NicholasBoll August 5, 2024 16:30
Copy link

cypress bot commented Aug 5, 2024



Test summary

999 0 3 0Flakiness 0


Run details

Project Workday/canvas-kit
Status Passed
Commit b95b05c ℹ️
Started Aug 5, 2024 4:44 PM
Ended Aug 5, 2024 4:49 PM
Duration 05:11 💡
OS Linux Ubuntu - 22.04
Browser Electron 94

View run in Cypress Cloud ➡️


This comment has been generated by cypress-bot as a result of this project's GitHub integration settings. You can manage this integration in this project's settings in the Cypress Cloud

@alanbsmith alanbsmith merged commit bda8ea7 into master Aug 5, 2024
20 checks passed
@alanbsmith alanbsmith deleted the merge/support-into-master branch August 5, 2024 20:14
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.

2 participants