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

Merged
merged 3 commits into from
Nov 4, 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 November 4, 2024 08:17
Adds Flexbox `gap` to overflow list calculations so that a the overflow list doesn't render outside the container. This is more noticeable with higher gap values.

Fixes #3020

[category:Components]
Copy link

cypress bot commented Nov 4, 2024

Workday/canvas-kit    Run #7967

Run Properties:  status check passed Passed #7967  •  git commit 7b3ec25248 ℹ️: Merge fff14ce4d897e0ef75d4f4e78ab5e0358e0a7300 into bc611c167b5746d576a5b1943ff0...
Project Workday/canvas-kit
Branch Review merge/support-into-master
Run status status check passed Passed #7967
Run duration 03m 45s
Commit git commit 7b3ec25248 ℹ️: Merge fff14ce4d897e0ef75d4f4e78ab5e0358e0a7300 into bc611c167b5746d576a5b1943ff0...
Committer Alan B Smith
View all properties for this run ↗︎

Test results
Tests that failed  Failures 0
Tests that were flaky  Flaky 30
Tests that did not run due to a developer annotating a test with .skip  Pending 24
Tests that did not run due to a failure in a mocha hook  Skipped 0
Tests that passed  Passing 1093
View all changes introduced in this branch ↗︎
UI Coverage  21.89%
  Untested elements 1625  
  Tested elements 453  
Accessibility  99.18%
  Failed rules  5 critical   5 serious   0 moderate   2 minor
  Failed elements 181  

@alanbsmith alanbsmith merged commit cd71a0e into master Nov 4, 2024
18 of 19 checks passed
@alanbsmith alanbsmith deleted the merge/support-into-master branch November 4, 2024 16:06
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