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.

Sign up for GitHub

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

Jump to bottom

[v5.2] Bump Buildah to v1.37.2, c/common v0.60.2, c/image v5.32.2 #23699

Merged
merged 7 commits into from
Aug 21, 2024
Merged

[v5.2] Bump Buildah to v1.37.2, c/common v0.60.2, c/image v5.32.2 #23699

merged 7 commits into from
Aug 21, 2024

Commits on Aug 21, 2024

  1. [v5.2] update golangci-lint to 1.60.1 

    Fixes new spotted issues around printf() formats and using os.Setenv()
in tests.

Signed-off-by: Paul Holzinger <[email protected]>
Signed-off-by: tomsweeneyredhat <[email protected]>
    @Luap99 @TomSweeneyRedHat
    Luap99 authored and TomSweeneyRedHat committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    3ca3c1d View commit details
    Browse the repository at this point in the history

  2. [v5.2] set !remote build tags where needed 

    The new golangci-lint version 1.60.1 has problems with typecheck when
linting remote files. We have certain pakcages that should never be
inlcuded in remote but the typecheck tries to compile all of them but
this never works and it seems to ignore the exclude files we gave it.

To fix this the proper way is to mark all packages we only use locally
with !remote tags. This is a bit ugly but more correct. I also moved the
DecodeChanges() code around as it is called from the client so the
handles package which should only be remote doesn't really fit anyway.

Signed-off-by: Paul Holzinger <[email protected]>
Signed-off-by: tomsweeneyredhat <[email protected]>
    @Luap99 @TomSweeneyRedHat
    Luap99 authored and TomSweeneyRedHat committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    35290c9 View commit details
    Browse the repository at this point in the history

  3. [v5.2] golangci-lint: remove most skip dirs 

    Now that we have propert !remote tags set everywhere we can just rely on
that and do not need to skip any dirs.
Also on linux do not lint three times, one remote run is enough.
We still have to skip the test dir for windows/macos though or we need
to add linux build tags there everywhere as well. This seems simpler.

Signed-off-by: Paul Holzinger <[email protected]>
Signed-off-by: tomsweeneyredhat <[email protected]>
    @Luap99 @TomSweeneyRedHat
    Luap99 authored and TomSweeneyRedHat committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    462c1c6 View commit details
    Browse the repository at this point in the history

  4. [v5.2] test/e2e: remove kernel version check 

    We need something newer than 4.14 anyway now for most Podman functions.
This is breaking liniting on windows as the function doesn't work there.

Signed-off-by: Paul Holzinger <[email protected]>
Signed-off-by: tomsweeneyredhat <[email protected]>
    @Luap99 @TomSweeneyRedHat
    Luap99 authored and TomSweeneyRedHat committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    b96312a View commit details
    Browse the repository at this point in the history

  5. [v5.2] golangci-lint: make windows linting happy 

    It qemu cannot be compiled anyway so make sure we do not try to compile
parts where the typechecker complains about on windows.
Also all the e2e test files are only used on linux as well.
pkg/machine/wsl also reports some error but to many for me to fix them
now. One minor problem was fixed in pkg/machine/machine_windows.go.

Signed-off-by: Paul Holzinger <[email protected]>
Signed-off-by: tomsweeneyredhat <[email protected]>
    @Luap99 @TomSweeneyRedHat
    Luap99 authored and TomSweeneyRedHat committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    faf3edb View commit details
    Browse the repository at this point in the history

  6. [v5.2] golangci-lint: make darwin linting happy 

    Fix one minor issue with vfkit error handling. First checking if err !=
nil OR errors.Is() is pointless as the err != is already true.
Second nilerr complains because we return nil when we hit an error
branch, in this case this is correct because an error means VM is
stopped.

Signed-off-by: Paul Holzinger <[email protected]>
Signed-off-by: tomsweeneyredhat <[email protected]>
    @Luap99 @TomSweeneyRedHat
    Luap99 authored and TomSweeneyRedHat committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    458d15c View commit details
    Browse the repository at this point in the history

  7. [v5.2] Bump Buildah to v1.37.2, c/common v0.60.2, c/image v5.32.2 

    As the title says.  Finishes the vendor dance for Podman v5.2.2

Signed-off-by: tomsweeneyredhat <[email protected]>
    @TomSweeneyRedHat
    TomSweeneyRedHat committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    570fbc4 View commit details
    Browse the repository at this point in the history