Skip to content

Commit 849e609

Browse files
committed
cherry-pick
Signed-off-by: Alyssa Goins <agoins@redhat.com>
1 parent 790efd2 commit 849e609

20 files changed

Lines changed: 196 additions & 210 deletions

File tree

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"appPort": 8080,
44
"features": {
55
"ghcr.io/devcontainers/features/go:1": {
6-
"version": "1.24"
6+
"version": "1.25"
77
},
88
"ghcr.io/devcontainers/features/node:1": {
99
"version": "20"

.github/workflows/ci-build.yaml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
codegen: ${{ steps.changed-files.outputs.codegen_any_modified == 'true' }}
4242
lint: ${{ steps.changed-files.outputs.lint_any_modified == 'true' }}
4343
ui: ${{ steps.changed-files.outputs.ui_any_modified == 'true' }}
44-
runs-on: ubuntu-24.04
44+
runs-on: ubuntu-latest
4545
steps:
4646
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
4747
with:
@@ -126,13 +126,13 @@ jobs:
126126
name: Unit Tests
127127
needs: [ changed-files ]
128128
if: ${{ needs.changed-files.outputs.tests == 'true' }}
129-
runs-on: ubuntu-24.04
129+
runs-on: ubuntu-latest
130130
timeout-minutes: 10
131131
steps:
132132
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
133133
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
134134
with:
135-
go-version: "1.24"
135+
go-version-file: go.mod
136136
cache: true
137137
- run: make test STATIC_FILES=false GOTEST='go test -p 20 -covermode=atomic -coverprofile=coverage.out'
138138
- name: Upload coverage report
@@ -154,7 +154,7 @@ jobs:
154154
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
155155
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
156156
with:
157-
go-version: "1.24"
157+
go-version-file: go.mod
158158
cache: true
159159
# windows run does not use makefile target because it does a lot more than just testing and is not cross-platform compatible
160160
- run: go test -p 20 -covermode=atomic -coverprofile='coverage.out' $(go list ./... | select-string -Pattern 'github.com/argoproj/argo-workflows/v3/workflow/controller' , 'github.com/argoproj/argo-workflows/v3/server' -NotMatch)
@@ -172,7 +172,7 @@ jobs:
172172
argo-images:
173173
name: argo-images
174174
# needs: [ lint ]
175-
runs-on: ubuntu-24.04
175+
runs-on: ubuntu-latest
176176
timeout-minutes: 10
177177
strategy:
178178
fail-fast: false
@@ -193,7 +193,7 @@ jobs:
193193
cache-from: type=gha
194194
cache-to: type=gha,mode=max
195195
- name: Upload
196-
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
196+
uses: actions/upload-artifact@v4
197197
with:
198198
name: ${{matrix.image}}_image.tar
199199
path: /tmp/${{matrix.image}}_image.tar
@@ -203,7 +203,7 @@ jobs:
203203
name: E2E Tests
204204
needs: [ changed-files, argo-images ]
205205
if: ${{ needs.changed-files.outputs.e2e-tests == 'true' }}
206-
runs-on: ubuntu-24.04
206+
runs-on: ubuntu-latest
207207
# These tests usually finish in ~25m, but occasionally they take much longer due to resource
208208
# contention on the runner, which we have no control over.
209209
timeout-minutes: 60
@@ -270,7 +270,7 @@ jobs:
270270
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
271271
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
272272
with:
273-
go-version: "1.24"
273+
go-version-file: go.mod
274274
cache: true
275275
- name: Install Java for the SDK
276276
if: ${{matrix.test == 'test-java-sdk'}}
@@ -386,7 +386,7 @@ jobs:
386386
name: E2E Tests - Composite result
387387
needs: [ e2e-tests ]
388388
if: ${{ always() }}
389-
runs-on: ubuntu-24.04
389+
runs-on: ubuntu-latest
390390
steps:
391391
- run: |
392392
result="${{ needs.e2e-tests.result }}"
@@ -401,15 +401,15 @@ jobs:
401401
name: Codegen
402402
needs: [ changed-files ]
403403
if: ${{ needs.changed-files.outputs.codegen == 'true' }}
404-
runs-on: ubuntu-24.04
404+
runs-on: ubuntu-latest
405405
timeout-minutes: 20
406406
env:
407407
GOPATH: /home/runner/go
408408
steps:
409409
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
410410
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
411411
with:
412-
go-version: "1.24"
412+
go-version-file: go.mod
413413
cache: true
414414
- name: Install protoc
415415
run: |
@@ -438,15 +438,15 @@ jobs:
438438
name: Lint
439439
needs: [ changed-files ]
440440
if: ${{ needs.changed-files.outputs.lint == 'true' }}
441-
runs-on: ubuntu-24.04
441+
runs-on: ubuntu-latest
442442
timeout-minutes: 15 # must be strictly greater than the timeout in .golangci.yml
443443
env:
444444
GOPATH: /home/runner/go
445445
steps:
446446
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
447447
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
448448
with:
449-
go-version: "1.24"
449+
go-version-file: go.mod
450450
cache: true
451451
- run: make lint STATIC_FILES=false
452452
# if lint makes changes that are not in the PR, fail the build
@@ -460,7 +460,7 @@ jobs:
460460
name: UI
461461
needs: [ changed-files ]
462462
if: ${{ needs.changed-files.outputs.ui == 'true' }}
463-
runs-on: ubuntu-24.04
463+
runs-on: ubuntu-latest
464464
timeout-minutes: 6
465465
env:
466466
NODE_OPTIONS: --max-old-space-size=4096

.github/workflows/docs.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ permissions:
2020

2121
jobs:
2222
docs:
23-
runs-on: ubuntu-24.04
23+
runs-on: ubuntu-latest
2424
if: >
2525
(
2626
github.event_name == 'issue_comment' &&
@@ -37,7 +37,7 @@ jobs:
3737
python-version: 3.9
3838
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
3939
with:
40-
go-version: "1.24"
40+
go-version-file: go.mod
4141
- uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
4242
with:
4343
node-version: "19"

.github/workflows/gh-pages.yaml

Whitespace-only changes.

.github/workflows/release.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
build-linux:
2424
name: Build & push linux
2525
if: github.repository == 'argoproj/argo-workflows'
26-
runs-on: ubuntu-24.04
26+
runs-on: ubuntu-latest
2727
strategy:
2828
matrix:
2929
platform: [ linux/amd64, linux/arm64 ]
@@ -150,7 +150,7 @@ jobs:
150150
push-images:
151151
name: Push manifest with all images
152152
if: github.repository == 'argoproj/argo-workflows'
153-
runs-on: ubuntu-24.04
153+
runs-on: ubuntu-latest
154154
needs: [ build-linux, build-windows ]
155155
steps:
156156
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
@@ -215,7 +215,7 @@ jobs:
215215
test-images-linux-amd64:
216216
name: Try pulling linux/amd64
217217
if: github.repository == 'argoproj/argo-workflows'
218-
runs-on: ubuntu-24.04
218+
runs-on: ubuntu-latest
219219
needs: [ push-images ]
220220
strategy:
221221
matrix:
@@ -292,7 +292,7 @@ jobs:
292292
publish-release:
293293
permissions:
294294
contents: write # for softprops/action-gh-release to create GitHub release
295-
runs-on: ubuntu-24.04
295+
runs-on: ubuntu-latest
296296
if: github.repository == 'argoproj/argo-workflows'
297297
needs: [ push-images, test-images-linux-amd64, test-images-windows ]
298298
env:
@@ -306,7 +306,7 @@ jobs:
306306
node-version: "20" # change in all GH Workflows
307307
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
308308
with:
309-
go-version: "1.24"
309+
go-version-file: go.mod
310310
- name: Restore node packages cache
311311
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
312312
with:

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ARG GIT_COMMIT=unknown
33
ARG GIT_TAG=unknown
44
ARG GIT_TREE_STATE=unknown
55

6-
FROM golang:1.24.4-alpine3.22 as builder
6+
FROM golang:1.25-alpine3.22 as builder
77

88
# libc-dev to build openapi-gen
99
RUN apk update && apk add --no-cache \

Dockerfile.windows

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ARG GIT_TREE_STATE=unknown
1111

1212
# had issues with official golange image for windows so I'm using plain servercore
1313
FROM mcr.microsoft.com/windows/servercore:${IMAGE_OS_VERSION} as builder
14-
ENV GOLANG_VERSION=1.24
14+
ENV GOLANG_VERSION=1.25
1515
SHELL ["powershell", "-Command"]
1616

1717
# install chocolatey package manager

argo-argoexec/Dockerfile.konflux

Whitespace-only changes.

argo-workflowcontroller/Dockerfile.ODH

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG SOURCE_CODE=.
22

3-
FROM registry.access.redhat.com/ubi9/go-toolset:1.24 as builder
3+
FROM registry.access.redhat.com/ubi9/go-toolset:1.25 as builder
44

55
# Build args to be used at this step
66
ARG SOURCE_CODE

argo-workflowcontroller/Dockerfile.konflux

Whitespace-only changes.

0 commit comments

Comments
 (0)