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

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.

williamjstanton and others added 2 commits September 16, 2024 11:08
I had been researching how to use `AriaLiveRegion` with the notification badges in the `GlobalHeader` storybook example, and noticed the `aria-live` regions were being used incorrectly here in this example.

[category:Documentation, examples]

Co-authored-by: William Stanton <[email protected]>
dependabot bot and others added 3 commits September 16, 2024 13:49
Bumps [express](https://github.com/expressjs/express) from 4.19.2 to 4.21.0.

[category:Dependencies]

Co-authored-by: @dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
.yarnrc Outdated Show resolved Hide resolved
Copy link

cypress bot commented Sep 16, 2024

Workday/canvas-kit    Run #7745

Run Properties:  status check passed Passed #7745  •  git commit 7c9f5da1f2 ℹ️: Merge 3b91e73e5c27e660a89767738c8ecd8c75ab56ca into bd882e1c4c3a8bb73ffcf74ce3da...
Project Workday/canvas-kit
Branch Review merge/prerelease/minor-into-prerelease/major
Run status status check passed Passed #7745
Run duration 03m 24s
Commit git commit 7c9f5da1f2 ℹ️: Merge 3b91e73e5c27e660a89767738c8ecd8c75ab56ca into bd882e1c4c3a8bb73ffcf74ce3da...
Committer Alan B Smith
View all properties for this run ↗︎

Test results
Tests that failed  Failures 0
Tests that were flaky  Flaky 14
Tests that did not run due to a developer annotating a test with .skip  Pending 16
Tests that did not run due to a failure in a mocha hook  Skipped 0
Tests that passed  Passing 854
View all changes introduced in this branch ↗︎
UI Coverage  21.07%
  Untested elements 1837  
  Tested elements 488  
Accessibility  99.23%
  Failed rules  5 critical   5 serious   0 moderate   2 minor
  Failed elements 229  

@alanbsmith alanbsmith merged commit 4058bee into prerelease/major Sep 16, 2024
19 of 20 checks passed
@alanbsmith alanbsmith deleted the merge/prerelease/minor-into-prerelease/major branch September 16, 2024 21:59
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