Skip to content

chore: Merge prerelease/minor into prerelease/major #3346

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

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.

@alanbsmith alanbsmith requested a review from RayRedGoose June 17, 2025 21:19
@jaclynjessup jaclynjessup moved this to 👀 In review in Canvas Kit Jun 17, 2025
Copy link

cypress bot commented Jun 17, 2025

Workday/canvas-kit    Run #8954

Run Properties:  status check passed Passed #8954  •  git commit 5a3447deae ℹ️: Merge cc3a0d1ed13c63541e42f49de47b1307f008bd53 into 2a00c1cb2d5d9535216908ec4a12...
Project Workday/canvas-kit
Branch Review merge/prerelease/minor-into-prerelease/major
Run status status check passed Passed #8954
Run duration 02m 52s
Commit git commit 5a3447deae ℹ️: Merge cc3a0d1ed13c63541e42f49de47b1307f008bd53 into 2a00c1cb2d5d9535216908ec4a12...
Committer Alan B Smith
View all properties for this run ↗︎

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

@alanbsmith alanbsmith merged commit 535370e into prerelease/major Jun 17, 2025
19 of 20 checks passed
@alanbsmith alanbsmith deleted the merge/prerelease/minor-into-prerelease/major branch June 17, 2025 21:36
@github-project-automation github-project-automation bot moved this from 👀 In review to ✅ Done in Canvas Kit Jun 17, 2025
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