Skip to content

Commit 4e957ec

Browse files
authored
Merge pull request #340 from thaJeztah/bump_golang_1.22.8
update to go1.23.6
2 parents f7f8554 + a767624 commit 4e957ec

File tree

5 files changed

+20
-5
lines changed

5 files changed

+20
-5
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ on:
1515

1616
env:
1717
DESTDIR: ./bin
18-
GO_VERSION: 1.21.10
18+
GO_VERSION: 1.23.6
1919

2020
jobs:
2121
validate:

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22

3-
ARG GO_VERSION=1.21.10
3+
ARG GO_VERSION=1.23.6
44
ARG DEBIAN_VERSION=bookworm
55

66
ARG XX_VERSION=1.6.1

Makefile

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,22 @@ COVERAGEDIR ?= ./bin/coverage
1212
# 10.11 is the minimum supported version for osxkeychain
1313
export MACOSX_DEPLOYMENT_TARGET = 10.11
1414
ifeq "$(shell go env GOOS)" "darwin"
15-
export CGO_CFLAGS = -mmacosx-version-min=$(MACOSX_DEPLOYMENT_TARGET)
15+
export CGO_CFLAGS = -Wno-atomic-alignment -mmacosx-version-min=$(MACOSX_DEPLOYMENT_TARGET)
16+
else
17+
# prevent warnings; see https://github.com/docker/docker-credential-helpers/pull/340#issuecomment-2437593837
18+
# gcc_libinit.c:44:8: error: large atomic operation may incur significant performance penalty; the access size (4 bytes) exceeds the max lock-free size (0 bytes) [-Werror,-Watomic-alignment]
19+
export CGO_CFLAGS = -Wno-atomic-alignment
20+
endif
21+
22+
ifeq "$(shell go env GOOS)/$(shell go env GOARCH)/$(shell go env GOARM)" "linux/arm/6"
23+
# Neither the CGo compiler, nor the C toolchain automatically link to
24+
# libatomic when the architecture doesn't support atomic intrinsics, as is
25+
# the case for arm/v6.
26+
#
27+
# Here's the error we get when this is not done (see https://github.com/docker/docker-credential-helpers/pull/340#issuecomment-2437593837):
28+
#
29+
# gcc_libinit.c:44:8: error: large atomic operation may incur significant performance penalty; the access size (4 bytes) exceeds the max lock-free size (0 bytes) [-Werror,-Watomic-alignment]
30+
export CGO_LDFLAGS=-latomic
1631
endif
1732

1833
.PHONY: all

deb/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22

3-
ARG GO_VERSION=1.21.10
3+
ARG GO_VERSION=1.23.6
44
ARG DISTRO=ubuntu
55
ARG SUITE=focal
66

docker-bake.hcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
variable "GO_VERSION" {
2-
default = "1.21.10"
2+
default = null
33
}
44

55
# Defines the output folder

0 commit comments

Comments
 (0)