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 (v14.x) #1855

Merged
merged 4 commits into from
Jun 8, 2021

Conversation

hops-release-bot[bot]
Copy link

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

Please resolve the conflicts and merge this PR afterwards by running the following command:

git fetch origin && \
git fetch origin pull/1844/head && \
git checkout update-jest-to-27-v14.x && \
git reset --hard HEAD^ && \
git cherry-pick 35d373eab1a2dc546891ce2f1de3f45a7160f32b e50c5955ab3c54f57cfd08bc4b2689da3b8ddce0 a9a9bd826708b3476f2fcc6d05199ad89511cd4b 30dbf6a7c103dcb73cfc6bd6c9f4f2fad5bfe03c

After successfully resolving all conflicts, you need to force-push your changes.

git push --force origin update-jest-to-27-v14.x

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.

@hops-release-bot hops-release-bot bot added the 📦 v14 Apply this label to a pull request, if it has to be cherry-picked to the v14.x-branch after merging. label Jun 8, 2021
@herschel666 herschel666 marked this pull request as ready for review June 8, 2021 06:39
@herschel666
Copy link
Contributor

bors merge

@bors
Copy link
Contributor

bors bot commented Jun 8, 2021

Build succeeded:

@bors bors bot merged commit 1544152 into release-bot/next-v14.x Jun 8, 2021
@bors bors bot deleted the update-jest-to-27-v14.x branch June 8, 2021 06:59
@hops-release-bot hops-release-bot bot mentioned this pull request Jun 8, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
📦 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