From 7953ef9a4fa2230a07dfaa7f209f87217a29e20f Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 11 Aug 2025 07:53:51 +0000 Subject: [PATCH] Update module github.com/imdario/mergo to v1 (#840) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Change | Age | Confidence | |---|---|---|---| | [github.com/imdario/mergo](https://github.com/imdario/mergo) | `v0.3.16` -> `v1.0.2` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fimdario%2fmergo/v1.0.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fimdario%2fmergo/v0.3.16/v1.0.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
imdario/mergo (github.com/imdario/mergo) ### [`v1.0.2`](https://github.com/darccio/mergo/releases/tag/v1.0.2) [Compare Source](https://github.com/imdario/mergo/compare/v1.0.1...v1.0.2) #### What's Changed - Drops `gopkg.in/yaml.v3`, only used for loading fixtures. Thanks [@​trim21](https://github.com/trim21) for bringing to my attention ([#​262](https://github.com/imdario/mergo/issues/262)) that this library is no longer maintained. **Full Changelog**: https://github.com/darccio/mergo/compare/v1.0.1...v1.0.2 ### [`v1.0.1`](https://github.com/darccio/mergo/releases/tag/v1.0.1) [Compare Source](https://github.com/imdario/mergo/compare/v1.0.0...v1.0.1) #### What's Changed - fixes issue [#​187](https://github.com/imdario/mergo/issues/187) by [@​vsemichev](https://github.com/vsemichev) in https://github.com/darccio/mergo/pull/253 - fix: `WithoutDereference` should respect non-nil struct pointers by [@​joshkaplinsky](https://github.com/joshkaplinsky) in https://github.com/darccio/mergo/pull/251 #### New Contributors - [@​vsemichev](https://github.com/vsemichev) made their first contribution in https://github.com/darccio/mergo/pull/253 - [@​joshkaplinsky](https://github.com/joshkaplinsky) made their first contribution in https://github.com/darccio/mergo/pull/251 **Full Changelog**: https://github.com/darccio/mergo/compare/v1.0.0...v1.0.1 ### [`v1.0.0`](https://github.com/darccio/mergo/releases/tag/v1.0.0): 1.0.0 released with new module URL: dario.cat/mergo [Compare Source](https://github.com/imdario/mergo/compare/v0.3.16...v1.0.0) This PR is a release containing [0.3.15](https://github.com/imdario/mergo/releases/tag/v0.3.15) features but changing the module URL to `dario.cat/mergo`. #### What's Changed - feat: v1.0.0 released by [@​imdario](https://github.com/imdario) in https://github.com/imdario/mergo/pull/238 **Full Changelog**: https://github.com/imdario/mergo/compare/v0.3.16...v1.0.0
--- ### Configuration 📅 **Schedule**: Branch creation - Between 12:00 AM and 03:59 AM ( * 0-3 * * * ) (UTC), Automerge - Between 12:00 AM and 03:59 AM ( * 0-3 * * * ) (UTC). 🚦 **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. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). - other - [PR](https://code.forgejo.org/forgejo/runner/pulls/840): Update module github.com/imdario/mergo to v1 Co-authored-by: Earl Warren Reviewed-on: https://code.forgejo.org/forgejo/runner/pulls/840 Co-authored-by: Renovate Bot Co-committed-by: Renovate Bot --- act/container/docker_run.go | 2 +- go.mod | 3 +-- go.sum | 6 ++---- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/act/container/docker_run.go b/act/container/docker_run.go index 34eb3703..ac52cee5 100644 --- a/act/container/docker_run.go +++ b/act/container/docker_run.go @@ -17,6 +17,7 @@ import ( "strings" "time" + "dario.cat/mergo" "github.com/Masterminds/semver" "github.com/docker/cli/cli/compose/loader" "github.com/docker/cli/cli/connhelper" @@ -31,7 +32,6 @@ import ( "github.com/go-git/go-billy/v5/osfs" "github.com/go-git/go-git/v5/plumbing/format/gitignore" "github.com/gobwas/glob" - "github.com/imdario/mergo" "github.com/joho/godotenv" "github.com/kballard/go-shellquote" specs "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/go.mod b/go.mod index 9350065b..c22ab410 100644 --- a/go.mod +++ b/go.mod @@ -7,6 +7,7 @@ toolchain go1.24.6 require ( code.forgejo.org/forgejo/actions-proto v0.5.1 connectrpc.com/connect v1.18.1 + dario.cat/mergo v1.0.2 github.com/Masterminds/semver v1.5.0 github.com/avast/retry-go/v4 v4.6.1 github.com/containerd/errdefs v1.0.0 @@ -19,7 +20,6 @@ require ( github.com/go-git/go-git/v5 v5.16.2 github.com/gobwas/glob v0.2.3 github.com/google/uuid v1.6.0 - github.com/imdario/mergo v0.3.16 github.com/joho/godotenv v1.5.1 github.com/julienschmidt/httprouter v1.3.0 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 @@ -44,7 +44,6 @@ require ( ) require ( - dario.cat/mergo v1.0.0 // indirect github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect github.com/Microsoft/go-winio v0.6.2 // indirect github.com/ProtonMail/go-crypto v1.1.6 // indirect diff --git a/go.sum b/go.sum index 0f3082f2..e6ca818e 100644 --- a/go.sum +++ b/go.sum @@ -2,8 +2,8 @@ code.forgejo.org/forgejo/actions-proto v0.5.1 h1:GCJHR/Y/Apk7Yl7CH9qOsKrdf/k0tRV code.forgejo.org/forgejo/actions-proto v0.5.1/go.mod h1:nu8N1HQLsu3c4T/PpYWbqwNBxsZnEOVxqV0mQWtIQvE= connectrpc.com/connect v1.18.1 h1:PAg7CjSAGvscaf6YZKUefjoih5Z/qYkyaTrBW8xvYPw= connectrpc.com/connect v1.18.1/go.mod h1:0292hj1rnx8oFrStN7cB4jjVBeqs+Yx5yDIC2prWDO8= -dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk= -dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= +dario.cat/mergo v1.0.2 h1:85+piFYR1tMbRrLcDwR18y4UKJ3aH1Tbzi24VRW1TK8= +dario.cat/mergo v1.0.2/go.mod h1:E/hbnu0NxMFBjpMIE34DRGLWqDy0g5FuKDhCb31ngxA= github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 h1:He8afgbRMd7mFxO99hRNu+6tazq8nFF9lIwo9JFroBk= github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8= github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0= @@ -92,8 +92,6 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms= github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0/go.mod h1:YN5jB8ie0yfIUg6VvR9Kz84aCaG7AsGZnLjhHbUqwPg= -github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4= -github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=