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

Merged
merged 6 commits into from
Dec 20, 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.

mannycarrera4 and others added 2 commits December 20, 2024 10:20
Fixes: #3084

Based on an [open issue in jscodeshift](facebook/jscodeshift#534), `recast` seems to be adding an extra parens in the return call in our unit tests. One of the suggested solutions was to downgrade `recast`. In v12, this has been fixed, but adding this resolution for v11.

[category:Dependencies]

Co-authored-by: manuel.carrera <[email protected]>
NicholasBoll and others added 3 commits December 20, 2024 17:58
Filter out the `openDirection` prop so it doesn't get forwarded to the `<button>` element.

[category:Components]
Copy link

cypress bot commented Dec 20, 2024

Workday/canvas-kit    Run #8147

Run Properties:  status check passed Passed #8147  •  git commit 4c54c4aa0b ℹ️: Merge 73fffa8c301ec04518f6c8596143aa4df6986d43 into 66db2d01a33a6b91d0a3723c3af2...
Project Workday/canvas-kit
Branch Review merge/support-into-master
Run status status check passed Passed #8147
Run duration 02m 43s
Commit git commit 4c54c4aa0b ℹ️: Merge 73fffa8c301ec04518f6c8596143aa4df6986d43 into 66db2d01a33a6b91d0a3723c3af2...
Committer Alan B Smith
View all properties for this run ↗︎

Test results
Tests that failed  Failures 0
Tests that were flaky  Flaky 2
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 923
View all changes introduced in this branch ↗︎
UI Coverage  21.26%
  Untested elements 1520  
  Tested elements 408  
Accessibility  99.15%
  Failed rules  6 critical   5 serious   0 moderate   2 minor
  Failed elements 162  

mannycarrera4
mannycarrera4 previously approved these changes Dec 20, 2024
yarn.lock Outdated
@@ -14751,7 +14751,7 @@ readdirp@~3.6.0:

recast@^0.20.3:
version "0.20.4"
resolved "https://registry.yarnpkg.com/recast/-/recast-0.20.4.tgz#db55983eac70c46b3fff96c8e467d65ffb4a7abc"
resolved "https://registry.npmjs.org/recast/-/recast-0.20.4.tgz#db55983eac70c46b3fff96c8e467d65ffb4a7abc"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is this npmjs?

@alanbsmith alanbsmith merged commit e342ed3 into master Dec 20, 2024
19 of 20 checks passed
@alanbsmith alanbsmith deleted the merge/support-into-master branch December 20, 2024 20:15
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