Skip to content

update to go1.22.6 - #5387

Merged
thaJeztah merged 1 commit into
docker:masterfrom
thaJeztah:update_go_1.22
Sep 3, 2024
Merged

update to go1.22.6#5387
thaJeztah merged 1 commit into
docker:masterfrom
thaJeztah:update_go_1.22

Conversation

@thaJeztah

@thaJeztahthaJeztah commented Sep 2, 2024

Copy link
Copy Markdown
Member

- What I did

- How I did it

- How to verify it

- Description for the changelog

update to go1.22.6

- A picture of a cute animal (not mandatory but encouraged)

@codecov-commenter

codecov-commenter commented Sep 2, 2024

Copy link
Copy Markdown

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 59.70%. Comparing base (623af46) to head (d7d5659).
Report is 20 commits behind head on master.

Additional details and impacted files
@@ Coverage Diff @@## master #5387 +/- ##
==========================================
- Coverage 60.94% 59.70% -1.25% 
==========================================
Files 304 345 +41 Lines 21346 23382 +2036 ==========================================
+ Hits 13010 13960 +950 - Misses 7407 8452 +1045 - Partials 929 970 +41 

@thaJeztah

Copy link
Copy Markdown
MemberAuthor

Ah; this is failing now on linux/arm/v6, linux/arm/v7, linux/riscv64, linux/s390x; related to #5388 (review)

 > [build-plugins 1/1] RUN --mount=ro --mount=type=cache,target=/root/.cache xx-go --wrap && TARGET=/out ./scripts/build/plugins e2e/cli-plugins/plugins/*:
0.864 Building static docker-helloworld
0.865 + CGO_ENABLED=0
0.865 + GO111MODULE=auto
0.865 + go build -o /out/plugins-linux-s390x/docker-helloworld -tags ' osusergo' -ldflags ' -X "github.com/docker/cli/cli/version.GitCommit=e5f5966" -X "github.com/docker/cli/cli/version.BuildTime=2024-09-02T15:12:34Z" -X "github.com/docker/cli/cli/version.Version=pr-5387" -extldflags -static' -buildmode=pie github.com/docker/cli/cli-plugins/examples/helloworld
0.873 -buildmode=pie requires external (cgo) linking, but cgo is not enabled

Comment threadscripts/build/plugins Outdated

echo "Building $GO_LINKMODE $(basename "${TARGET_PLUGIN}")"
(set -x ; CGO_ENABLED=0 GO111MODULE=auto go build -o "${TARGET_PLUGIN}" -tags "${GO_BUILDTAGS}" -ldflags "${GO_LDFLAGS}" ${GO_BUILDMODE} "github.com/docker/cli/${p}")
(set -x ; CGO_ENABLED=0 GO111MODULE=auto go build -o "${TARGET_PLUGIN}" -tags "${GO_BUILDTAGS}" -ldflags "${GO_LDFLAGS}" "github.com/docker/cli/${p}")

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Wondering if instead, this should be removing the CGO_ENABLED=0 (similar to how we handle the main binary); that said, I don't think we need CGO here for the plugin (maybe for the -X flags?)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
thaJeztah merged commit 2dd127a into docker:masterSep 3, 2024
@thaJeztah
thaJeztah deleted the update_go_1.22 branch September 3, 2024 11:25
@vvolandvvoland mentioned this pull request Sep 3, 2024
1 task
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@thaJeztah@codecov-commenter@vvoland