Skip to content

Commit 3fb825c

Browse files
authored
chore: update Go to 1.24.6 (release-3.0) (#24092)
Signed-off-by: Ville Vesilehto <[email protected]>
1 parent 7822fbd commit 3fb825c

File tree

7 files changed

+10
-10
lines changed

7 files changed

+10
-10
lines changed

.github/workflows/ci-build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
env:
1515
# Golang version to use across CI steps
1616
# renovate: datasource=golang-version packageName=golang
17-
GOLANG_VERSION: '1.24.4'
17+
GOLANG_VERSION: '1.24.6'
1818

1919
concurrency:
2020
group: ${{ github.workflow }}-${{ github.ref }}

.github/workflows/image.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
with:
5454
# Note: cannot use env variables to set go-version (https://docs.github.com/en/actions/using-workflows/reusing-workflows#limitations)
5555
# renovate: datasource=golang-version packageName=golang
56-
go-version: 1.24.4
56+
go-version: 1.24.6
5757
platforms: ${{ needs.set-vars.outputs.platforms }}
5858
push: false
5959

@@ -70,7 +70,7 @@ jobs:
7070
ghcr_image_name: ghcr.io/argoproj/argo-cd/argocd:${{ needs.set-vars.outputs.image-tag }}
7171
# Note: cannot use env variables to set go-version (https://docs.github.com/en/actions/using-workflows/reusing-workflows#limitations)
7272
# renovate: datasource=golang-version packageName=golang
73-
go-version: 1.24.4
73+
go-version: 1.24.6
7474
platforms: ${{ needs.set-vars.outputs.platforms }}
7575
push: true
7676
secrets:

.github/workflows/release.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ permissions: {}
1111

1212
env:
1313
# renovate: datasource=golang-version packageName=golang
14-
GOLANG_VERSION: '1.24.4' # Note: go-version must also be set in job argocd-image.with.go-version
14+
GOLANG_VERSION: '1.24.6' # Note: go-version must also be set in job argocd-image.with.go-version
1515

1616
jobs:
1717
argocd-image:
@@ -25,7 +25,7 @@ jobs:
2525
quay_image_name: quay.io/argoproj/argocd:${{ github.ref_name }}
2626
# Note: cannot use env variables to set go-version (https://docs.github.com/en/actions/using-workflows/reusing-workflows#limitations)
2727
# renovate: datasource=golang-version packageName=golang
28-
go-version: 1.24.4
28+
go-version: 1.24.6
2929
platforms: linux/amd64,linux/arm64,linux/s390x,linux/ppc64le
3030
push: true
3131
secrets:

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ARG BASE_IMAGE=docker.io/library/ubuntu:24.04@sha256:80dd3c3b9c6cecb9f1667e9290b
44
# Initial stage which pulls prepares build dependencies and CLI tooling we need for our final image
55
# Also used as the image in CI jobs so needs all dependencies
66
####################################################################################################
7-
FROM docker.io/library/golang:1.24.4@sha256:db5d0afbfb4ab648af2393b92e87eaae9ad5e01132803d80caef91b5752d289c AS builder
7+
FROM docker.io/library/golang:1.24.6@sha256:2c89c41fb9efc3807029b59af69645867cfe978d2b877d475be0d72f6c6ce6f6 AS builder
88

99
WORKDIR /tmp
1010

@@ -103,7 +103,7 @@ RUN HOST_ARCH=$TARGETARCH NODE_ENV='production' NODE_ONLINE_ENV='online' NODE_OP
103103
####################################################################################################
104104
# Argo CD Build stage which performs the actual build of Argo CD binaries
105105
####################################################################################################
106-
FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.24.4@sha256:db5d0afbfb4ab648af2393b92e87eaae9ad5e01132803d80caef91b5752d289c AS argocd-build
106+
FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.24.6@sha256:2c89c41fb9efc3807029b59af69645867cfe978d2b877d475be0d72f6c6ce6f6 AS argocd-build
107107

108108
WORKDIR /go/src/github.com/argoproj/argo-cd
109109

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/argoproj/argo-cd/v3
22

3-
go 1.24.4
3+
go 1.24.6
44

55
require (
66
code.gitea.io/sdk/gitea v0.20.0

test/container/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RUN ln -s /usr/lib/$(uname -m)-linux-gnu /usr/lib/linux-gnu
88
# Please make sure to also check the contained yarn version and update the references below when upgrading this image's version
99
FROM docker.io/library/node:22.9.0@sha256:69e667a79aa41ec0db50bc452a60e705ca16f35285eaf037ebe627a65a5cdf52 AS node
1010

11-
FROM docker.io/library/golang:1.24.4@sha256:db5d0afbfb4ab648af2393b92e87eaae9ad5e01132803d80caef91b5752d289c AS golang
11+
FROM docker.io/library/golang:1.24.6@sha256:2c89c41fb9efc3807029b59af69645867cfe978d2b877d475be0d72f6c6ce6f6 AS golang
1212

1313
FROM docker.io/library/registry:2.8@sha256:543dade69668e02e5768d7ea2b0aa4fae6aa7384c9a5a8dbecc2be5136079ddb AS registry
1414

test/remote/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG BASE_IMAGE=docker.io/library/ubuntu:24.04@sha256:80dd3c3b9c6cecb9f1667e9290b3bc61b78c2678c02cbdae5f0fea92cc6734ab
22

3-
FROM docker.io/library/golang:1.24.4@sha256:db5d0afbfb4ab648af2393b92e87eaae9ad5e01132803d80caef91b5752d289c AS go
3+
FROM docker.io/library/golang:1.24.6@sha256:2c89c41fb9efc3807029b59af69645867cfe978d2b877d475be0d72f6c6ce6f6 AS go
44

55
RUN go install github.com/mattn/goreman@latest && \
66
go install github.com/kisielk/godepgraph@latest

0 commit comments

Comments
 (0)