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

[release/1.5] vendor: golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f #7515

Merged
merged 1 commit into from
Oct 17, 2022

Conversation

thaJeztah
Copy link
Member

Taking the same version as used in the 1.6 branch from 6ee5bb7

golang/sys@33da011...8c9f86f

Older versions appear to be failing on macOS with go1.18:

Error: ../../../go/pkg/mod/golang.org/x/[email protected]/unix/syscall_darwin.1_13.go:29:3: //go:linkname must refer to declared function or variable
Error: ../../../go/pkg/mod/golang.org/x/[email protected]/unix/zsyscall_darwin_amd64.1_13.go:27:3: //go:linkname must refer to declared function or variable
Error: ../../../go/pkg/mod/golang.org/x/[email protected]/unix/zsyscall_darwin_amd64.1_13.go:40:3: //go:linkname must refer to declared function or variable
Error: ../../../go/pkg/mod/golang.org/x/[email protected]/unix/zsyscall_darwin_amd64.go:28:3: //go:linkname must refer to declared function or variable
Error: ../../../go/pkg/mod/golang.org/x/[email protected]/unix/zsyscall_darwin_amd64.go:43:3: //go:linkname must refer to declared function or variable
...
Error: ../../../go/pkg/mod/golang.org/x/[email protected]/unix/zsyscall_darwin_amd64.go:121:3: too many errors
Error: Process completed with exit code 2.

@k8s-ci-robot
Copy link

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

…a55f

Taking the same version as used in the 1.6 branch from 6ee5bb7

golang/sys@33da011...8c9f86f

Older versions appear to be failing on macOS with go1.18:

    Error: ../../../go/pkg/mod/golang.org/x/[email protected]/unix/syscall_darwin.1_13.go:29:3: //go:linkname must refer to declared function or variable
    Error: ../../../go/pkg/mod/golang.org/x/[email protected]/unix/zsyscall_darwin_amd64.1_13.go:27:3: //go:linkname must refer to declared function or variable
    Error: ../../../go/pkg/mod/golang.org/x/[email protected]/unix/zsyscall_darwin_amd64.1_13.go:40:3: //go:linkname must refer to declared function or variable
    Error: ../../../go/pkg/mod/golang.org/x/[email protected]/unix/zsyscall_darwin_amd64.go:28:3: //go:linkname must refer to declared function or variable
    Error: ../../../go/pkg/mod/golang.org/x/[email protected]/unix/zsyscall_darwin_amd64.go:43:3: //go:linkname must refer to declared function or variable
    ...
    Error: ../../../go/pkg/mod/golang.org/x/[email protected]/unix/zsyscall_darwin_amd64.go:121:3: too many errors
    Error: Process completed with exit code 2.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah closed this Oct 12, 2022
@thaJeztah thaJeztah reopened this Oct 12, 2022
@thaJeztah thaJeztah marked this pull request as ready for review October 12, 2022 21:33
Copy link
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

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

LGTM

@thaJeztah
Copy link
Member Author

So, initially this PR failed, and I found that it was because make vendor in this branch doesn't update the go.mod in integration/client, which caused (I think) golang to search GOPATH for the dependency (which also was a fun one). I might have a look at updating make vendor in this branch as well (although 1.5 is nearly EOL, so may not be worth the effort)

@thaJeztah
Copy link
Member Author

Hm... not sure if this fixes the issue #7476 (comment) (although updating shouldn't be a bad thing to do)

Copy link
Member

@mikebrow mikebrow left a comment

Choose a reason for hiding this comment

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

LGTM

@estesp estesp merged commit d987e76 into containerd:release/1.5 Oct 17, 2022
@thaJeztah thaJeztah deleted the 1.5_bump_x_sys branch October 17, 2022 16:01
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.

4 participants