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

feat: update Jest to version 27 #1844

Merged
merged 4 commits into from
Jun 8, 2021
Merged

feat: update Jest to version 27 #1844

merged 4 commits into from
Jun 8, 2021

Conversation

herschel666
Copy link
Contributor

@herschel666 herschel666 commented May 31, 2021

The Canarist tests aren't helpful here, because the dependency tree of the Canarist test monorepo contains both Jest v26 & Jest v27 packages. This won't work.

closes #1760 #1761 #1831 #1832 #1838 #1839

Bors merge bot cheat sheet

We are using bors-ng to automate merging of our pull requests. The following table provides a summary of commands that are available to reviewers (members of this repository with push access) and delegates (in case of bors delegate+ or bors delegate=[list]).

Syntax Description
bors merge Run the test suite and push to master if it passes. Short for "reviewed: looks good."
bors merge- Cancel an r+, r=, merge, or merge=
bors try Run the test suite without pushing to master.
bors try- Cancel a try
bors delegate+ Allow the pull request author to merge their changes.
bors delegate=[list] Allow the listed users to r+ this pull request's changes.
bors retry Run the previous command a second time.

This is a short collection of opinionated commands. For a full list of the commands read the bors reference.

@herschel666 herschel666 added 📦 master Apply this label to a pull request, if it has to be cherry-picked to the maste-branch. 📦 v14 Apply this label to a pull request, if it has to be cherry-picked to the v14.x-branch after merging. labels May 31, 2021
@herschel666 herschel666 force-pushed the update-jest-to-27 branch 2 times, most recently from be56286 to 5b81746 Compare June 7, 2021 06:31
@herschel666 herschel666 marked this pull request as ready for review June 7, 2021 08:36
ZauberNerd
ZauberNerd previously approved these changes Jun 7, 2021
Copy link
Contributor

@ZauberNerd ZauberNerd left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me.
If you've checked that the babel-jest import still works on v26, then go ahead and merge it :)

packages/jest-preset/transforms/babel.js Outdated Show resolved Hide resolved
@ZauberNerd
Copy link
Contributor

bors merge

bors bot added a commit that referenced this pull request Jun 7, 2021
1844: feat: update Jest to version 27 r=ZauberNerd a=herschel666

The Canarist tests aren't helpful here, because the dependency tree of the Canarist test monorepo contains both Jest v26 & Jest v27 packages. This won't work.

closes #1760 #1761 #1831 #1832 #1838 #1839

<details>
<summary>Bors merge bot cheat sheet</summary>

We are using [bors-ng](https://github.com/bors-ng/bors-ng) to automate merging of our pull requests. The following table provides a summary of commands that are available to reviewers (members of this repository with push access) and delegates (in case of `bors delegate+` or `bors delegate=[list]`).

| Syntax | Description |
| --- | --- |
| bors merge | Run the test suite and push to master if it passes. Short for "reviewed: looks good." |
| bors merge- | Cancel an r+, r=, merge, or merge= |
| bors try | Run the test suite without pushing to master. |
| bors try- | Cancel a try |
| bors delegate+ | Allow the pull request author to merge their changes. |
| bors delegate=[list] | Allow the listed users to r+ this pull request's changes. |
| bors retry | Run the previous command a second time. |

This is a short collection of opinionated commands. For a full list of the commands read the [bors reference](https://bors.tech/documentation/).

</details>


Co-authored-by: Emanuel Kluge <[email protected]>
@bors
Copy link
Contributor

bors bot commented Jun 7, 2021

Build failed:

  • canarist/internal-workshop

packages/jest-preset/package.json Outdated Show resolved Hide resolved
packages/jest-preset/package.json Outdated Show resolved Hide resolved
@ZauberNerd
Copy link
Contributor

And to get the canarist tests green, we could add resolutions to the root manifest using canarist: https://github.com/xing/hops/blob/master/package.json#L60-L64

@herschel666
Copy link
Contributor Author

And to get the canarist tests green, we could add resolutions to the root manifest

That's right, but it doesn't give us any clue on whether the preset will really work with both v26 and v27. Will do it anyway, so we'll be able to use bors for merging. 👍

@herschel666
Copy link
Contributor Author

bors merge

@bors
Copy link
Contributor

bors bot commented Jun 8, 2021

Build succeeded:

@bors bors bot merged commit 5a95149 into master Jun 8, 2021
@bors bors bot deleted the update-jest-to-27 branch June 8, 2021 06:29
@hops-release-bot
Copy link

Cherry-pick failed on branch v14.x!

Please check out PR #1855 & resolve the conflicts.

@hops-release-bot hops-release-bot bot mentioned this pull request Jun 8, 2021
bors bot added a commit that referenced this pull request Jun 8, 2021
1855: feat: update Jest to version 27 (v14.x) r=herschel666 a=hops-release-bot[bot]

:warning: **This PR is the successor of #1844 and has been created automatically because the previous PR's commits could not be cherry-picked.** ⚠️

Co-authored-by: Emanuel Kluge <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
📦 master Apply this label to a pull request, if it has to be cherry-picked to the maste-branch. 📦 v14 Apply this label to a pull request, if it has to be cherry-picked to the v14.x-branch after merging.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants