Skip to content

Commit

Permalink
Merge #1868
Browse files Browse the repository at this point in the history
1868: chore: set Jest resolution for Canarist test r=herschel666 a=herschel666

...in order to fix the tests

<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]>
  • Loading branch information
bors[bot] and Emanuel Kluge authored Jun 17, 2021
2 parents 74899ea + 92e6548 commit 9d883d6
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,14 @@
"url": "enc:r6BTklZr+axySHpOBj0JyiGPh/P525a+dfwfWHQq5kkrY1Wruq8QaSL2vCfb0cWp",
"branch": "hops-15.x"
}
]
],
"rootManifest": {
"resolutions": {
"babel-jest": "^27",
"jest": "^27",
"ts-jest": "^27"
}
}
}
]
},
Expand Down

0 comments on commit 9d883d6

Please sign in to comment.