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 master into prerelease/minor #3037

Merged
merged 3 commits into from
Nov 6, 2024

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/master-into-prerelease/minor || true
    git fetch upstream
    git checkout --track upstream/merge/master-into-prerelease/minor
    git pull upstream merge/master-into-prerelease/minor -f
    git pull upstream master
    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 master into prerelease/minor"
    
  4. Push the merge commit back to the pull request
    git push upstream merge/master-into-prerelease/minor
    

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.

mannycarrera4 and others added 2 commits November 5, 2024 17:19
Update Github Actions node version to 18

[category:Infrastructure]

Co-authored-by: manuel.carrera <[email protected]>
Upgrade jscodeshift from `0.14.0` to `17.1.0` [SNYK-JS-INFLIGHT-6095116](https://snyk.io/vuln/SNYK-JS-INFLIGHT-6095116). There should be no breaking changes, for more information view their [changeset](https://github.com/facebook/jscodeshift/blob/main/CHANGELOG.md#1700-2024-08-06).

[category:Dependencies]

Co-authored-by: @snyk-bot <[email protected]>
Co-authored-by: manuel.carrera <[email protected]>
Copy link

cypress bot commented Nov 5, 2024

Workday/canvas-kit    Run #7993

Run Properties:  status check passed Passed #7993  •  git commit 212d98aa28 ℹ️: Merge c0410e2e4d7d322d7e91a5f1fca2af6b87ea2ec9 into 6259a19bb3bb9912528c6f949bca...
Project Workday/canvas-kit
Branch Review merge/master-into-prerelease/minor
Run status status check passed Passed #7993
Run duration 03m 58s
Commit git commit 212d98aa28 ℹ️: Merge c0410e2e4d7d322d7e91a5f1fca2af6b87ea2ec9 into 6259a19bb3bb9912528c6f949bca...
Committer Alan B Smith
View all properties for this run ↗︎

Test results
Tests that failed  Failures 0
Tests that were flaky  Flaky 26
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.81%
  Untested elements 1640  
  Tested elements 455  
Accessibility  99.18%
  Failed rules  5 critical   5 serious   0 moderate   2 minor
  Failed elements 181  

@alanbsmith alanbsmith merged commit 2fa9149 into prerelease/minor Nov 6, 2024
18 checks passed
@alanbsmith alanbsmith deleted the merge/master-into-prerelease/minor branch November 6, 2024 20:22
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