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

Adding support for squash: interface. #17

Merged
merged 3 commits into from
Aug 12, 2024

Conversation

m1k1o
Copy link

@m1k1o m1k1o commented Apr 1, 2024

Porting the upstream PR mitchellh#325 that fixes the upstream issue mitchellh#186.

Copy link
Member

@sagikazarmark sagikazarmark left a comment

Choose a reason for hiding this comment

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

@m1k1o thanks for the contribution!

Would you mind fixing the lint error?

Thanks!

@sagikazarmark sagikazarmark added this to the v2.1.0 milestone Aug 11, 2024
@m1k1o m1k1o force-pushed the squash-interface-2 branch from d700414 to abed3a6 Compare August 12, 2024 09:59
@m1k1o
Copy link
Author

m1k1o commented Aug 12, 2024

@m1k1o thanks for the contribution!

Would you mind fixing the lint error?

Thanks!

Fixed and resolved merge conflict with main branch.

@m1k1o m1k1o requested a review from sagikazarmark August 12, 2024 10:08
@sagikazarmark
Copy link
Member

Thanks!

@sagikazarmark sagikazarmark merged commit c97971d into go-viper:main Aug 12, 2024
8 checks passed
codeboten referenced this pull request in open-telemetry/opentelemetry-collector Aug 13, 2024
[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
|
[github.com/go-viper/mapstructure/v2](https://togithub.com/go-viper/mapstructure)
| `v2.0.0` -> `v2.1.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fgo-viper%2fmapstructure%2fv2/v2.1.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fgo-viper%2fmapstructure%2fv2/v2.1.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fgo-viper%2fmapstructure%2fv2/v2.0.0/v2.1.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fgo-viper%2fmapstructure%2fv2/v2.0.0/v2.1.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

> [!WARNING]
> Some dependencies could not be looked up. Check the Dependency
Dashboard for more information.

---

### Release Notes

<details>
<summary>go-viper/mapstructure
(github.com/go-viper/mapstructure/v2)</summary>

###
[`v2.1.0`](https://togithub.com/go-viper/mapstructure/releases/tag/v2.1.0)

[Compare
Source](https://togithub.com/go-viper/mapstructure/compare/v2.0.0...v2.1.0)

#### What's Changed

- build(deps): bump actions/setup-go from 5.0.0 to 5.0.1 by
[@&#8203;dependabot](https://togithub.com/dependabot) in
[https://github.com/go-viper/mapstructure/pull/28](https://togithub.com/go-viper/mapstructure/pull/28)
- build(deps): bump actions/checkout from 4.1.1 to 4.1.6 by
[@&#8203;dependabot](https://togithub.com/dependabot) in
[https://github.com/go-viper/mapstructure/pull/27](https://togithub.com/go-viper/mapstructure/pull/27)
- build(deps): bump golangci/golangci-lint-action from 3.7.0 to 6.0.1 by
[@&#8203;dependabot](https://togithub.com/dependabot) in
[https://github.com/go-viper/mapstructure/pull/26](https://togithub.com/go-viper/mapstructure/pull/26)
- build(deps): bump actions/setup-go from 5.0.1 to 5.0.2 by
[@&#8203;dependabot](https://togithub.com/dependabot) in
[https://github.com/go-viper/mapstructure/pull/34](https://togithub.com/go-viper/mapstructure/pull/34)
- build(deps): bump actions/checkout from 4.1.6 to 4.1.7 by
[@&#8203;dependabot](https://togithub.com/dependabot) in
[https://github.com/go-viper/mapstructure/pull/29](https://togithub.com/go-viper/mapstructure/pull/29)
- Port Succo's fix to cache decodeHooks by
[@&#8203;cedric-cordenier](https://togithub.com/cedric-cordenier) in
[https://github.com/go-viper/mapstructure/pull/33](https://togithub.com/go-viper/mapstructure/pull/33)
- build(deps): bump golangci/golangci-lint-action from 6.0.1 to 6.1.0 by
[@&#8203;dependabot](https://togithub.com/dependabot) in
[https://github.com/go-viper/mapstructure/pull/38](https://togithub.com/go-viper/mapstructure/pull/38)
- Add configuration option to specify tag value that indicates squash by
[@&#8203;triarius](https://togithub.com/triarius) in
[https://github.com/go-viper/mapstructure/pull/18](https://togithub.com/go-viper/mapstructure/pull/18)
- Adding support for squash: interface. by
[@&#8203;m1k1o](https://togithub.com/m1k1o) in
[https://github.com/go-viper/mapstructure/pull/17](https://togithub.com/go-viper/mapstructure/pull/17)

#### New Contributors

- [@&#8203;dependabot](https://togithub.com/dependabot) made their first
contribution in
[https://github.com/go-viper/mapstructure/pull/28](https://togithub.com/go-viper/mapstructure/pull/28)
- [@&#8203;cedric-cordenier](https://togithub.com/cedric-cordenier) made
their first contribution in
[https://github.com/go-viper/mapstructure/pull/33](https://togithub.com/go-viper/mapstructure/pull/33)
- [@&#8203;triarius](https://togithub.com/triarius) made their first
contribution in
[https://github.com/go-viper/mapstructure/pull/18](https://togithub.com/go-viper/mapstructure/pull/18)
- [@&#8203;m1k1o](https://togithub.com/m1k1o) made their first
contribution in
[https://github.com/go-viper/mapstructure/pull/17](https://togithub.com/go-viper/mapstructure/pull/17)

**Full Changelog**:
go-viper/mapstructure@v2.0.0...v2.1.0

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any
time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR was generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View the
[repository job
log](https://developer.mend.io/github/open-telemetry/opentelemetry-collector).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC4yMC4xIiwidXBkYXRlZEluVmVyIjoiMzguMjAuMSIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiZGVwZW5kZW5jaWVzIiwicmVub3ZhdGVib3QiXX0=-->

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: opentelemetrybot <[email protected]>
Co-authored-by: Alex Boten <[email protected]>
nono referenced this pull request in cozy/cozy-stack Sep 18, 2024
#4464)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
|
[github.com/go-viper/mapstructure/v2](https://redirect.github.com/go-viper/mapstructure)
| `v2.0.0` -> `v2.1.0` |
[![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fgo-viper%2fmapstructure%2fv2/v2.1.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fgo-viper%2fmapstructure%2fv2/v2.1.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fgo-viper%2fmapstructure%2fv2/v2.0.0/v2.1.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fgo-viper%2fmapstructure%2fv2/v2.0.0/v2.1.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Release Notes

<details>
<summary>go-viper/mapstructure
(github.com/go-viper/mapstructure/v2)</summary>

###
[`v2.1.0`](https://redirect.github.com/go-viper/mapstructure/releases/tag/v2.1.0)

[Compare
Source](https://redirect.github.com/go-viper/mapstructure/compare/v2.0.0...v2.1.0)

#### What's Changed

- build(deps): bump actions/setup-go from 5.0.0 to 5.0.1 by
[@&#8203;dependabot](https://redirect.github.com/dependabot) in
[https://github.com/go-viper/mapstructure/pull/28](https://redirect.github.com/go-viper/mapstructure/pull/28)
- build(deps): bump actions/checkout from 4.1.1 to 4.1.6 by
[@&#8203;dependabot](https://redirect.github.com/dependabot) in
[https://github.com/go-viper/mapstructure/pull/27](https://redirect.github.com/go-viper/mapstructure/pull/27)
- build(deps): bump golangci/golangci-lint-action from 3.7.0 to 6.0.1 by
[@&#8203;dependabot](https://redirect.github.com/dependabot) in
[https://github.com/go-viper/mapstructure/pull/26](https://redirect.github.com/go-viper/mapstructure/pull/26)
- build(deps): bump actions/setup-go from 5.0.1 to 5.0.2 by
[@&#8203;dependabot](https://redirect.github.com/dependabot) in
[https://github.com/go-viper/mapstructure/pull/34](https://redirect.github.com/go-viper/mapstructure/pull/34)
- build(deps): bump actions/checkout from 4.1.6 to 4.1.7 by
[@&#8203;dependabot](https://redirect.github.com/dependabot) in
[https://github.com/go-viper/mapstructure/pull/29](https://redirect.github.com/go-viper/mapstructure/pull/29)
- Port Succo's fix to cache decodeHooks by
[@&#8203;cedric-cordenier](https://redirect.github.com/cedric-cordenier)
in
[https://github.com/go-viper/mapstructure/pull/33](https://redirect.github.com/go-viper/mapstructure/pull/33)
- build(deps): bump golangci/golangci-lint-action from 6.0.1 to 6.1.0 by
[@&#8203;dependabot](https://redirect.github.com/dependabot) in
[https://github.com/go-viper/mapstructure/pull/38](https://redirect.github.com/go-viper/mapstructure/pull/38)
- Add configuration option to specify tag value that indicates squash by
[@&#8203;triarius](https://redirect.github.com/triarius) in
[https://github.com/go-viper/mapstructure/pull/18](https://redirect.github.com/go-viper/mapstructure/pull/18)
- Adding support for squash: interface. by
[@&#8203;m1k1o](https://redirect.github.com/m1k1o) in
[https://github.com/go-viper/mapstructure/pull/17](https://redirect.github.com/go-viper/mapstructure/pull/17)

#### New Contributors

- [@&#8203;dependabot](https://redirect.github.com/dependabot) made
their first contribution in
[https://github.com/go-viper/mapstructure/pull/28](https://redirect.github.com/go-viper/mapstructure/pull/28)
-
[@&#8203;cedric-cordenier](https://redirect.github.com/cedric-cordenier)
made their first contribution in
[https://github.com/go-viper/mapstructure/pull/33](https://redirect.github.com/go-viper/mapstructure/pull/33)
- [@&#8203;triarius](https://redirect.github.com/triarius) made their
first contribution in
[https://github.com/go-viper/mapstructure/pull/18](https://redirect.github.com/go-viper/mapstructure/pull/18)
- [@&#8203;m1k1o](https://redirect.github.com/m1k1o) made their first
contribution in
[https://github.com/go-viper/mapstructure/pull/17](https://redirect.github.com/go-viper/mapstructure/pull/17)

**Full Changelog**:
go-viper/mapstructure@v2.0.0...v2.1.0

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "before 6am on Monday" in timezone
Europe/Paris, Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/).
View the [repository job
log](https://developer.mend.io/github/cozy/cozy-stack).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC43NC4xIiwidXBkYXRlZEluVmVyIjoiMzguNzQuMSIsInRhcmdldEJyYW5jaCI6Im1hc3RlciIsImxhYmVscyI6W119-->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants