Skip to content

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

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.

@jaclynjessup jaclynjessup moved this to 👀 In review in Canvas Kit Jun 4, 2025
Copy link

cypress bot commented Jun 4, 2025

Workday/canvas-kit    Run #8906

Run Properties:  status check failed Failed #8906  •  git commit d690fe2c02 ℹ️: Merge 86f70a4ec4ca617768227b9dbe44bd7ae5675d6e into 3c15a81810dfe2232ca4519ae857...
Project Workday/canvas-kit
Branch Review merge/prerelease/minor-into-prerelease/major
Run status status check failed Failed #8906
Run duration 03m 03s
Commit git commit d690fe2c02 ℹ️: Merge 86f70a4ec4ca617768227b9dbe44bd7ae5675d6e into 3c15a81810dfe2232ca4519ae857...
Committer Alan B Smith
View all properties for this run ↗︎

Test results
Tests that failed  Failures 1
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 911
View all changes introduced in this branch ↗︎

Warning

Partial Report: The results for the Application Quality reports may be incomplete.

UI Coverage  21.31%
  Untested elements 1509  
  Tested elements 406  
Accessibility  99.11%
  Failed rules  6 critical   5 serious   0 moderate   2 minor
  Failed elements 97  

Tests for review

Failed  Dialog.spec.tsx • 1 failed test

View Output

Test Artifacts
An uncaught error was detected outside of a test Test Replay Screenshots
Failed  MenuPreview.tsx • 0 failed tests

View Output

Test Artifacts
Failed  InformationHighlight.spec.tsx • 0 failed tests

View Output

Test Artifacts
Failed  Button.spec.tsx • 0 failed tests

View Output

Test Artifacts
Failed  Hyperlink.spec.tsx • 0 failed tests

View Output

Test Artifacts

The first 5 failed specs are shown, see all 7 specs in Cypress Cloud.

Flakiness  cypress/component/SelectPreview.spec.tsx • 2 flaky tests

View Output

Test Artifacts
... > when the down arrow key is pressed for a second time > when the up arrow key is pressed > the menu > should set assistive focus to the "E-mail" option Test Replay Screenshots
... > when focus is advanced to the second option ("Phone") > when the menu is closed WITHOUT selecting the newly focused option ("Phone") > when the menu is re-opened AFTER it has fully closed > the menu > should have reset assistive focus to the first option ("E-mail") Test Replay Screenshots

@alanbsmith alanbsmith disabled auto-merge June 5, 2025 14:33
@alanbsmith alanbsmith enabled auto-merge June 5, 2025 14:33
@alanbsmith alanbsmith merged commit 659c3de into prerelease/major Jun 5, 2025
23 of 29 checks passed
@alanbsmith alanbsmith deleted the merge/prerelease/minor-into-prerelease/major branch June 5, 2025 15:16
@github-project-automation github-project-automation bot moved this from 👀 In review to ✅ Done in Canvas Kit Jun 5, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: ✅ Done
Development

Successfully merging this pull request may close these issues.

2 participants