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

Bump chai from 4.5.0 to 5.1.2 #5314

Merged
merged 1 commit into from
Feb 4, 2025
Merged

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Jan 31, 2025

Bumps chai from 4.5.0 to 5.1.2.

Release notes

Sourced from chai's releases.

v5.1.2

What's Changed

Full Changelog: chaijs/chai@v5.1.1...v5.1.2

v5.1.1

What's Changed

New Contributors

Full Changelog: chaijs/chai@v5.1.0...v5.1.1

v5.1.0

What's Changed

New Contributors

Full Changelog: chaijs/chai@v5.0.3...v5.1.0

v5.0.3

Fix bad v5.0.2 publish.

Full Changelog: chaijs/chai@v5.0.2...v5.0.3

v5.0.2

What's Changed

... (truncated)

Commits

Dependabot compatibility score

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

@dependabot dependabot bot added dependencies Pull requests that update a dependency file javascript Pull requests that update Javascript code labels Jan 31, 2025
@github-actions github-actions bot added this to the 3.10.0 milestone Jan 31, 2025
@dependabot dependabot bot force-pushed the dependabot/npm_and_yarn/chai-5.1.2 branch from 22b3aff to 358daef Compare February 3, 2025 15:30
@Gustry
Copy link
Member

Gustry commented Feb 3, 2025

I guess as JSUnit is working, we can merge this PR ?

@Gustry Gustry requested review from rldhont and nboisteault February 3, 2025 17:09
@dependabot dependabot bot force-pushed the dependabot/npm_and_yarn/chai-5.1.2 branch from 358daef to 344fc82 Compare February 4, 2025 08:38
Bumps [chai](https://github.com/chaijs/chai) from 4.5.0 to 5.1.2.
- [Release notes](https://github.com/chaijs/chai/releases)
- [Changelog](https://github.com/chaijs/chai/blob/main/History.md)
- [Commits](chaijs/chai@v4.5.0...v5.1.2)

---
updated-dependencies:
- dependency-name: chai
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
@dependabot dependabot bot force-pushed the dependabot/npm_and_yarn/chai-5.1.2 branch from 344fc82 to 500a708 Compare February 4, 2025 09:12
@rldhont
Copy link
Collaborator

rldhont commented Feb 4, 2025

@Gustry I guess too

@Gustry Gustry merged commit 098fd47 into master Feb 4, 2025
16 of 17 checks passed
@Gustry Gustry deleted the dependabot/npm_and_yarn/chai-5.1.2 branch February 4, 2025 10:08
@3liz-bot
Copy link
Contributor

3liz-bot commented Feb 4, 2025

The backport to release_3_8 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 500a708b8... Bump chai from 4.5.0 to 5.1.2
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"

stdout
Auto-merging package-lock.json
Auto-merging package.json
CONFLICT (content): Merge conflict in package.json

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release_3_8 release_3_8
# Navigate to the new working tree
cd .worktrees/backport-release_3_8
# Create a new branch
git switch --create backport-5314-to-release_3_8
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 500a708b8d0916c21220719677207243f370e05a
# Push it to GitHub
git push --set-upstream origin backport-5314-to-release_3_8
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release_3_8

Then, create a pull request where the base branch is release_3_8 and the compare/head branch is backport-5314-to-release_3_8.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release_3_8 backport release_3_9 dependencies Pull requests that update a dependency file failed backport javascript Pull requests that update Javascript code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants