Skip to content

Adopt clean-merge upstream PRs (batch 1)#1

Merged
thomasdesr merged 11 commits into
mainfrom
thomas/merge-clean-upstream-prs
Jun 29, 2026
Merged

Adopt clean-merge upstream PRs (batch 1)#1
thomasdesr merged 11 commits into
mainfrom
thomas/merge-clean-upstream-prs

Conversation

@thomasdesr

Copy link
Copy Markdown

First batch of fork adoption: 11 vetted upstream PRs from googlecontainertools/container-structure-test, each landed as its own commit.

Code and bazel fixes

Go dependency bumps

Applied via go get plus go mod tidy rather than the upstream diffs, to avoid go.sum conflicts.

GitHub Actions bumps

All 11 applied cleanly, none dropped.

go build, go test, and go mod verify all pass on the direnv toolchain (go1.26.4). go vet reports two findings, both pre-existing and in files this branch does not touch (pkg/drivers/host_driver.go:90 unkeyed struct fields, pkg/types/v1/file_existence.go:59 an unused fmt.Errorf result). Both are present on main with a clean build cache. This branch removes one prior vet finding, the test.go:156 format specifier that GoogleContainerTools#485 fixes.

Reviewers not requested: CODEOWNERS lists upstream maintainers who are not on the fork.

thomasdesr and others added 11 commits June 29, 2026 11:06
…eContainerTools#538)

Co-authored-by: Eric Higgins <eric-higgins-ai@users.noreply.github.com>
Upstream-PR: GoogleContainerTools#538
…Tools#543)

Co-authored-by: Tom van der Woerdt <TvdW@users.noreply.github.com>
Upstream-PR: GoogleContainerTools#543
)

Co-authored-by: Benjamin Peterson <benjaminp@users.noreply.github.com>
Upstream-PR: GoogleContainerTools#485
Also pulls spf13/pflag v1.0.9.

Co-authored-by: dependabot[bot] <support@github.com>
Upstream-PR: GoogleContainerTools#536
Co-authored-by: dependabot[bot] <support@github.com>
Upstream-PR: GoogleContainerTools#540
…ols#488)

Co-authored-by: dependabot[bot] <support@github.com>
Upstream-PR: GoogleContainerTools#488
Co-authored-by: dependabot[bot] <support@github.com>
Upstream-PR: GoogleContainerTools#513
Co-authored-by: dependabot[bot] <support@github.com>
Upstream-PR: GoogleContainerTools#561
)

Co-authored-by: dependabot[bot] <support@github.com>
Upstream-PR: GoogleContainerTools#556
@thomasdesr thomasdesr merged commit 422c769 into main Jun 29, 2026
8 of 10 checks passed
@thomasdesr thomasdesr deleted the thomas/merge-clean-upstream-prs branch June 29, 2026 18:14
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.

1 participant