mirror of
https://github.com/docker/docker-credential-helpers.git
synced 2026-06-16 01:12:47 +05:30
Merge pull request #340 from thaJeztah/bump_golang_1.22.8
update to go1.23.6
This commit is contained in:
@@ -15,7 +15,7 @@ on:
|
|||||||
|
|
||||||
env:
|
env:
|
||||||
DESTDIR: ./bin
|
DESTDIR: ./bin
|
||||||
GO_VERSION: 1.21.10
|
GO_VERSION: 1.23.6
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
validate:
|
validate:
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
# syntax=docker/dockerfile:1
|
# syntax=docker/dockerfile:1
|
||||||
|
|
||||||
ARG GO_VERSION=1.21.10
|
ARG GO_VERSION=1.23.6
|
||||||
ARG DEBIAN_VERSION=bookworm
|
ARG DEBIAN_VERSION=bookworm
|
||||||
|
|
||||||
ARG XX_VERSION=1.6.1
|
ARG XX_VERSION=1.6.1
|
||||||
|
|||||||
@@ -12,7 +12,22 @@ COVERAGEDIR ?= ./bin/coverage
|
|||||||
# 10.11 is the minimum supported version for osxkeychain
|
# 10.11 is the minimum supported version for osxkeychain
|
||||||
export MACOSX_DEPLOYMENT_TARGET = 10.11
|
export MACOSX_DEPLOYMENT_TARGET = 10.11
|
||||||
ifeq "$(shell go env GOOS)" "darwin"
|
ifeq "$(shell go env GOOS)" "darwin"
|
||||||
export CGO_CFLAGS = -mmacosx-version-min=$(MACOSX_DEPLOYMENT_TARGET)
|
export CGO_CFLAGS = -Wno-atomic-alignment -mmacosx-version-min=$(MACOSX_DEPLOYMENT_TARGET)
|
||||||
|
else
|
||||||
|
# prevent warnings; see https://github.com/docker/docker-credential-helpers/pull/340#issuecomment-2437593837
|
||||||
|
# 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]
|
||||||
|
export CGO_CFLAGS = -Wno-atomic-alignment
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifeq "$(shell go env GOOS)/$(shell go env GOARCH)/$(shell go env GOARM)" "linux/arm/6"
|
||||||
|
# Neither the CGo compiler, nor the C toolchain automatically link to
|
||||||
|
# libatomic when the architecture doesn't support atomic intrinsics, as is
|
||||||
|
# the case for arm/v6.
|
||||||
|
#
|
||||||
|
# Here's the error we get when this is not done (see https://github.com/docker/docker-credential-helpers/pull/340#issuecomment-2437593837):
|
||||||
|
#
|
||||||
|
# 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]
|
||||||
|
export CGO_LDFLAGS=-latomic
|
||||||
endif
|
endif
|
||||||
|
|
||||||
.PHONY: all
|
.PHONY: all
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
# syntax=docker/dockerfile:1
|
# syntax=docker/dockerfile:1
|
||||||
|
|
||||||
ARG GO_VERSION=1.21.10
|
ARG GO_VERSION=1.23.6
|
||||||
ARG DISTRO=ubuntu
|
ARG DISTRO=ubuntu
|
||||||
ARG SUITE=focal
|
ARG SUITE=focal
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
variable "GO_VERSION" {
|
variable "GO_VERSION" {
|
||||||
default = "1.21.10"
|
default = null
|
||||||
}
|
}
|
||||||
|
|
||||||
# Defines the output folder
|
# Defines the output folder
|
||||||
|
|||||||
Reference in New Issue
Block a user