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

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.

NicholasBoll and others added 2 commits October 7, 2024 20:13
- Support modifiers with a `false` value

[category:Styling]
josh-bagwell and others added 3 commits October 7, 2024 14:55
Fixes: #2946  

Updates Button variants to fix merge style issue.

[category:Components]

Release Note:
Updates Button variants to fix merge style issue.

Co-authored-by: manuel.carrera <[email protected]>
mannycarrera4
mannycarrera4 previously approved these changes Oct 7, 2024
Copy link

cypress bot commented Oct 7, 2024

Workday/canvas-kit    Run #7844

Run Properties:  status check passed Passed #7844  •  git commit 781880b9bf ℹ️: Merge 28e3fe87b4cf78c7cd3703f5e5d8dd323ccc35f7 into 06b35f786069a81a2aba5fbd42b4...
Project Workday/canvas-kit
Run status status check passed Passed #7844
Run duration 03m 50s
Commit git commit 781880b9bf ℹ️: Merge 28e3fe87b4cf78c7cd3703f5e5d8dd323ccc35f7 into 06b35f786069a81a2aba5fbd42b4...
Committer Alan B Smith
View all properties for this run ↗︎

Test results
Tests that failed  Failures 0
Tests that were flaky  Flaky 27
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 1089
UI Coverage  21.75%
  Untested elements 1639  
  Tested elements 453  
Accessibility  99.06%
  Failed rules  5 critical   6 serious   0 moderate   2 minor
  Failed elements 368  

@mannycarrera4 mannycarrera4 dismissed their stale review October 7, 2024 22:28

something broken

auto-merge was automatically disabled October 7, 2024 22:47

Pull request was closed

@mannycarrera4 mannycarrera4 reopened this Oct 8, 2024
@alanbsmith alanbsmith merged commit 7f3254a into prerelease/major Oct 8, 2024
18 of 20 checks passed
@alanbsmith alanbsmith deleted the merge/prerelease/minor-into-prerelease/major branch October 8, 2024 15:32
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.

4 participants