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

build(deps): Bump github.com/stretchr/testify from 1.7.0 to 1.7.1 in /price-feeder (backport #656) #695

Merged
merged 3 commits into from
Mar 25, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 25, 2022

This is an automatic backport of pull request #656 done by Mergify.
Cherry-pick of 51ce7f0 has failed:

On branch mergify/bp/release/v0.8.x/pr-656
Your branch is up to date with 'origin/release/v0.8.x'.

You are currently cherry-picking commit 51ce7f0.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   price-feeder/go.sum

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   price-feeder/go.mod

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

…/price-feeder (#656)

Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.7.0 to 1.7.1.
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/stretchr/testify/commit/083ff1c0449867d0d8d456483ee5fab8e0c0e1e6"><code>083ff1c</code></a> Fixed didPanic to now detect panic(nil).</li>
<li><a href="https://github.com/stretchr/testify/commit/1e36bfe10404cb77c12f6dfc8665564f3a41ad7e"><code>1e36bfe</code></a> Use cross Go version compatible build tag syntax</li>
<li><a href="https://github.com/stretchr/testify/commit/e798dc2763edab11eadc45df377ff160c6c86fd1"><code>e798dc2</code></a> Add docs on 1.17 build tags</li>
<li><a href="https://github.com/stretchr/testify/commit/83198c2c50a6190cf9b038c485c65c5ed8b6cd3a"><code>83198c2</code></a> assert: guard CanConvert call in backward compatible wrapper</li>
<li><a href="https://github.com/stretchr/testify/commit/087b655c75372ea14309c2df573a2280c54afac6"><code>087b655</code></a> assert: allow comparing time.Time</li>
<li><a href="https://github.com/stretchr/testify/commit/7bcf74e94f95af11a6a7c0b9a5d9a719605d4faa"><code>7bcf74e</code></a> fix msgAndArgs forwarding</li>
<li><a href="https://github.com/stretchr/testify/commit/c29de713426fdf9068696c483705fdbb24a815ac"><code>c29de71</code></a> add tests for correct msgAndArgs forwarding</li>
<li><a href="https://github.com/stretchr/testify/commit/f87e2b211992baaf0251ae5ad1a530aaa9266570"><code>f87e2b2</code></a> Update builds</li>
<li><a href="https://github.com/stretchr/testify/commit/ab6dc3262822ed562480c19876b0257ace761e3e"><code>ab6dc32</code></a> fix linting errors in /assert package</li>
<li><a href="https://github.com/stretchr/testify/commit/edff5a049b1c4eacd84bec25bcf7e7852b7c1163"><code>edff5a0</code></a> fix funtion name</li>
<li>Additional commits viewable in <a href="https://github.com/stretchr/testify/compare/v1.7.0...v1.7.1">compare view</a></li>
</ul>
</details>
<br />

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=github.com/stretchr/testify&package-manager=go_modules&previous-version=1.7.0&new-version=1.7.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

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-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

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 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)

</details>

(cherry picked from commit 51ce7f0)

# Conflicts:
#	price-feeder/go.mod
@toteki
Copy link
Member

toteki commented Mar 25, 2022

Note: This was the 4th of 5 missing backports for release/v0.8.x

Conflicts label has appeared here unlike in the first three - I'll see if it disappears automatically if I merge those backports in order (as long as mergify automatically keeps up to date).

@toteki
Copy link
Member

toteki commented Mar 25, 2022

@Mergifyio update

@mergify
Copy link
Contributor Author

mergify bot commented Mar 25, 2022

update

❌ Base branch update has failed

merge conflict between base and head
err-code: 8BCD1

@toteki
Copy link
Member

toteki commented Mar 25, 2022

@Mergifyio rebase

@mergify
Copy link
Contributor Author

mergify bot commented Mar 25, 2022

rebase

❌ Base branch update has failed

Git reported the following error:

Rebasing (1/1)
Auto-merging price-feeder/go.mod
CONFLICT (content): Merge conflict in price-feeder/go.mod
Auto-merging price-feeder/go.sum
error: could not apply a596fc9... build(deps): Bump github.com/stretchr/testify from 1.7.0 to 1.7.1 in /price-feeder (#656)
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply a596fc9... build(deps): Bump github.com/stretchr/testify from 1.7.0 to 1.7.1 in /price-feeder (#656)

err-code: DBAEA

price-feeder/go.mod Outdated Show resolved Hide resolved
@toteki toteki merged commit 7ef1dc2 into release/v0.8.x Mar 25, 2022
@toteki toteki deleted the mergify/bp/release/v0.8.x/pr-656 branch March 25, 2022 07:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant