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 #2770

Merged
merged 5 commits into from
Jun 10, 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 June 10, 2024 09:07
Fixes: #2756

Models use the object spread operator to allow `config` to override `defaultConfig`. If `undefined` is passed to a key, it would cause `undefined` to be assigned to config even if the model didn't allow for that. Instead of using an object spread, `config` keys are looped over to check for `undefined` values.

[category:Components]
NicholasBoll and others added 3 commits June 10, 2024 09:25
Update `aria-haspopup` to `menu` in `Select.Input`. This was added some time ago, but the order of composed hooks overwrote the value.

[category:Components]
Copy link

cypress bot commented Jun 10, 2024

Passing run #7364 ↗︎

0 974 3 0 Flakiness 0

Details:

Merge 387f715 into 36c6182...
Project: canvas-kit Commit: eb19b0e88e ℹ️
Status: Passed Duration: 05:07 💡
Started: Jun 10, 2024 4:03 PM Ended: Jun 10, 2024 4:08 PM

Review all test suite changes for PR #2770 ↗︎

@alanbsmith alanbsmith merged commit 0f85b34 into master Jun 10, 2024
19 checks passed
@alanbsmith alanbsmith deleted the merge/support-into-master branch June 10, 2024 16:09
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.

None yet

3 participants