You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
#1987 failed to apply on top of branch "stable/2023.2":
Applying: fix: update go dependencies
Using index info to reconstruct a base tree...
M go.mod
M go.sum
Falling back to patching base and 3-way merge...
Auto-merging go.sum
Auto-merging go.mod
Applying: go mod tidy
Using index info to reconstruct a base tree...
M go.mod
M go.sum
Falling back to patching base and 3-way merge...
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 go mod tidy
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
The text was updated successfully, but these errors were encountered:
oras-go is the main reason.
types.AuthConfig is deprecated in docker v25.x.x.
This causes unit test failure.
/go/pkg/mod/oras.land/[email protected]/pkg/auth/docker/login_tls.go:44:20: undefined: types.AuthConfig /go/pkg/mod/oras.land/[email protected]/pkg/auth/docker/login_tls.go:62:131: undefined: types.AuthConfig /go/pkg/mod/oras.land/[email protected]/pkg/auth/docker/login_tls.go:122:32: undefined: types.AuthConfig /go/pkg/mod/oras.land/[email protected]/pkg/auth/docker/login.go:54:16: undefined: types.AuthConfig oras-go is indirect dep belonging to helm.sh/helm/v3. Since v3.15.2, helm uses 1.2.5 oras-go.
Btw, I updated helm to v3.16.2.
here are references.
oras-project/oras-go#691oras-project/oras-go#697https://github.com/helm/helm/releases/tag/v3.15.2fix#2002
Depends-On: #2027
Manual cherrypick required.
#1987 failed to apply on top of branch "stable/2023.2":
The text was updated successfully, but these errors were encountered: