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

fix inconsitent go build tags #1417

Merged
merged 3 commits into from
Nov 4, 2022
Merged

fix inconsitent go build tags #1417

merged 3 commits into from
Nov 4, 2022

Conversation

Luap99
Copy link
Member

@Luap99 Luap99 commented Nov 2, 2022

Run go fmt ./... which automatically adds the new build tag syntax.
This change is backwards compatible.

CI: run make local-validate

Make sure all PRs are formated with go fmt correctly.
I added it to the existing lint job as this seems to make the most
sense to me.

@rhatdan
Copy link
Member

rhatdan commented Nov 2, 2022

Lint is broken.

@Luap99 Luap99 force-pushed the build-tags branch 2 times, most recently from d428827 to 18ee330 Compare November 2, 2022 19:45
Run `go fmt ./...` which automatically adds the new build tag syntax.
This change is backwards compatible.

Signed-off-by: Paul Holzinger <[email protected]>
Make sure all PRs are formated with `go fmt` correctly.
I added it to the existing lint job as this seems to make the most
sense to me.

Signed-off-by: Paul Holzinger <[email protected]>
It is impossible to have this passing because it did not run in CI and
invalid commit were merged since the fixed commit. The correct way
should be to always use the merge base commit instead, at least this
will only check commit that are actually part of the PR not all which is
wasteful. Also removed unused $PATH overwrite and $GITVALIDATE_FLAGS
var.

Signed-off-by: Paul Holzinger <[email protected]>
@Luap99
Copy link
Member Author

Luap99 commented Nov 3, 2022

This should good now, the one failure is caused by a CI issue. I do not have permission to restart it here.

Copy link
Member

@lsm5 lsm5 left a comment

Choose a reason for hiding this comment

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

/lgtm
/hold

@lsm5
Copy link
Member

lsm5 commented Nov 4, 2022

looks like it needs a rebase

@rhatdan rhatdan merged commit 5472e81 into containers:main Nov 4, 2022
@lsm5
Copy link
Member

lsm5 commented Nov 4, 2022

@rhatdan i think would be nice to get this vendored into podman, buildah, skopeo soon as possible.

@Luap99 Luap99 deleted the build-tags branch November 4, 2022 12:31
@Luap99
Copy link
Member Author

Luap99 commented Nov 4, 2022

@lsm5 did you checked if it fixes your issue?
AFAIK go is still backwards compatible with the old tags so it should at least in theory work even without this PR.

@lsm5
Copy link
Member

lsm5 commented Nov 4, 2022

Didn't check prior. Anyway, trying to vendor it now on f37 with golang v1.19.2 and I'm seeing unrelated vendoring issues

github.com/containers/podman/v4/cmd/podman/images imports
	github.com/containers/ocicrypt/helpers imports
	github.com/containers/ocicrypt/utils imports
	gopkg.in/square/go-jose.v2: unrecognized import path "gopkg.in/square/go-jose.v2": https fetch: Get "https://gopkg.in/square/go-jose.v2?go-get=1": dial tcp 185.125.188.236:443: i/o timeout

I'll spin up a c9s vm in a bit and look further

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.

3 participants