Skip to content

Commit 33478b6

Browse files
mergify[bot]github-actions[bot]ebeahanpkoutsovasilis
authored
[8.18](backport #5400) [Automation] Bump Golang version to 1.24.7 (#5451)
* [Automation] Bump Golang version to 1.24.7 (#5400) * chore: Update go.mod Made with ❤️️ by updatecli * chore: Update go.mod Made with ❤️️ by updatecli * chore: Update go.mod Made with ❤️️ by updatecli * chore: Update .go-version Made with ❤️️ by updatecli * chore: Update .golangci.yml Made with ❤️️ by updatecli * fix: switch Dockerfile to use golang-crossbuild * fix: add SUFFIX arg and mage in the PATH --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Panos Koutsovasilis <[email protected]> (cherry picked from commit c0f5f75) # Conflicts: # Dockerfile # dev-tools/go.mod * fix conflicts * fix: switch Dockerfile of serverless image to trixie because golang-crossbuild isn't compatible with buildx multiplatforms (#5455) (cherry picked from commit a7e0e73) # Conflicts: # Dockerfile # magefile.go * fix: remove irrelevant files * fix: pass SNAPSHOT env var in docker-release make target --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: ebeahan <[email protected]> Co-authored-by: Panos Koutsovasilis <[email protected]>
1 parent d0a0a1a commit 33478b6

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

.go-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.24.6
1+
1.24.7

.golangci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ run:
44
timeout: 1m
55
build-tags:
66
- integration
7-
go: "1.24.6"
7+
go: "1.24.7"
88

99
issues:
1010
# Maximum count of issues with the same text.

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ARG GO_VERSION
2-
FROM --platform=${BUILDPLATFORM:-linux} golang:${GO_VERSION}-bullseye AS builder
2+
FROM --platform=${BUILDPLATFORM:-linux} golang:${GO_VERSION}-trixie AS builder
33

44
WORKDIR /usr/src/fleet-server
55

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ endif
324324

325325
.PHONY: docker-release
326326
docker-release: build-releaser ## - Builds a release for all platforms in a dockerised environment
327-
docker run --rm -u $(shell id -u):$(shell id -g) --env=GOCACHE=/go/cache --env='PLATFORMS=${PLATFORMS}' --volume $(PWD):/go/src/github.com/elastic/fleet-server $(BUILDER_IMAGE) release
327+
docker run --rm -u $(shell id -u):$(shell id -g) --env=GOCACHE=/go/cache -e SNAPSHOT=$(or $(SNAPSHOT),false) --env='PLATFORMS=${PLATFORMS}' --volume $(PWD):/go/src/github.com/elastic/fleet-server $(BUILDER_IMAGE) release
328328

329329
.PHONY: docker-cover-e2e-binaries
330330
docker-cover-e2e-binaries: build-releaser

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/elastic/fleet-server/v7
22

3-
go 1.24.6
3+
go 1.24.7
44

55
require (
66
github.com/Pallinder/go-randomdata v1.2.0

testing/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/elastic/fleet-server/testing
22

3-
go 1.24.6
3+
go 1.24.7
44

55
replace (
66
github.com/elastic/fleet-server/pkg/api => ../pkg/api

0 commit comments

Comments
 (0)