Skip to content

Commit 6340072

Browse files
committed
Merge remote-tracking branch 'upstream/stable'
2 parents 003ed2b + 23b749a commit 6340072

31 files changed

Lines changed: 136 additions & 114 deletions

.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.26"
77
},
88
"ghcr.io/devcontainers/features/node:1": {
99
"version": "20"
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: "Set up Go"
2+
description: "Installs Go from Red Hat go-toolset image (includes FIPS support)"
3+
runs:
4+
using: composite
5+
steps:
6+
- name: Extract Go from go-toolset
7+
shell: bash
8+
env:
9+
GO_TOOLSET_IMAGE: "registry.access.redhat.com/ubi9/go-toolset:1.26.3@sha256:d36470d5258da00f618b7aca9bdaab8e05134aa938bd6c42d9bd17d50ed45e76"
10+
run: |
11+
set -euo pipefail
12+
docker rm -f go-toolset 2>/dev/null || true
13+
docker create --name go-toolset "$GO_TOOLSET_IMAGE"
14+
docker cp go-toolset:/usr/lib/golang $HOME/go-toolset
15+
docker rm go-toolset
16+
echo "GOROOT=$HOME/go-toolset" >> $GITHUB_ENV
17+
echo "$HOME/go-toolset/bin" >> $GITHUB_PATH
18+
echo "$HOME/go/bin" >> $GITHUB_PATH
19+
- name: Verify Go installation
20+
shell: bash
21+
run: go version
22+
- name: Cache Go modules and build cache
23+
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
24+
with:
25+
path: |
26+
~/go/pkg/mod
27+
~/.cache/go-build
28+
key: go-${{ runner.os }}-${{ hashFiles('**/go.sum') }}
29+
restore-keys: |
30+
go-${{ runner.os }}-

.github/workflows/changelog.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
permissions:
1717
contents: write # for peter-evans/create-pull-request to create branch
1818
pull-requests: write # for peter-evans/create-pull-request to create a PR
19-
runs-on: ubuntu-24.04
19+
runs-on: ubuntu-latest
2020
steps:
2121
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
2222
with:

.github/workflows/ci-build.yaml

Lines changed: 14 additions & 26 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,14 +126,11 @@ 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
133-
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
134-
with:
135-
go-version: "1.24"
136-
cache: true
133+
- uses: ./.github/actions/setup-go
137134
- run: make test STATIC_FILES=false GOTEST='go test -p 20 -covermode=atomic -coverprofile=coverage.out'
138135
- name: Upload coverage report
139136
# engineers just ignore this in PRs, so lets not even run it
@@ -147,14 +144,14 @@ jobs:
147144
tests-windows:
148145
name: Windows Unit Tests
149146
needs: [ changed-files ]
150-
if: ${{ needs.changed-files.outputs.tests == 'true' }}
147+
if: false # Disabled: godebug fips140=auto requires Red Hat go-toolset, which is not available on Windows
151148
runs-on: windows-2022
152149
timeout-minutes: 20
153150
steps:
154151
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
155152
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
156153
with:
157-
go-version: "1.24"
154+
go-version-file: go.mod
158155
cache: true
159156
# windows run does not use makefile target because it does a lot more than just testing and is not cross-platform compatible
160157
- 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 +169,7 @@ jobs:
172169
argo-images:
173170
name: argo-images
174171
# needs: [ lint ]
175-
runs-on: ubuntu-24.04
172+
runs-on: ubuntu-latest
176173
timeout-minutes: 10
177174
strategy:
178175
fail-fast: false
@@ -203,7 +200,7 @@ jobs:
203200
name: E2E Tests
204201
needs: [ changed-files, argo-images ]
205202
if: ${{ needs.changed-files.outputs.e2e-tests == 'true' }}
206-
runs-on: ubuntu-24.04
203+
runs-on: ubuntu-latest
207204
# These tests usually finish in ~25m, but occasionally they take much longer due to resource
208205
# contention on the runner, which we have no control over.
209206
timeout-minutes: 60
@@ -268,10 +265,7 @@ jobs:
268265
- name: Install socat (needed by Kubernetes)
269266
run: sudo apt-get -y install socat
270267
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
271-
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
272-
with:
273-
go-version: "1.24"
274-
cache: true
268+
- uses: ./.github/actions/setup-go
275269
- name: Install Java for the SDK
276270
if: ${{matrix.test == 'test-java-sdk'}}
277271
uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
@@ -386,7 +380,7 @@ jobs:
386380
name: E2E Tests - Composite result
387381
needs: [ e2e-tests ]
388382
if: ${{ always() }}
389-
runs-on: ubuntu-24.04
383+
runs-on: ubuntu-latest
390384
steps:
391385
- run: |
392386
result="${{ needs.e2e-tests.result }}"
@@ -401,16 +395,13 @@ jobs:
401395
name: Codegen
402396
needs: [ changed-files ]
403397
if: ${{ needs.changed-files.outputs.codegen == 'true' }}
404-
runs-on: ubuntu-24.04
398+
runs-on: ubuntu-latest
405399
timeout-minutes: 20
406400
env:
407401
GOPATH: /home/runner/go
408402
steps:
409403
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
410-
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
411-
with:
412-
go-version: "1.24"
413-
cache: true
404+
- uses: ./.github/actions/setup-go
414405
- name: Install protoc
415406
run: |
416407
set -eux -o pipefail
@@ -438,16 +429,13 @@ jobs:
438429
name: Lint
439430
needs: [ changed-files ]
440431
if: ${{ needs.changed-files.outputs.lint == 'true' }}
441-
runs-on: ubuntu-24.04
432+
runs-on: ubuntu-latest
442433
timeout-minutes: 15 # must be strictly greater than the timeout in .golangci.yml
443434
env:
444435
GOPATH: /home/runner/go
445436
steps:
446437
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
447-
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
448-
with:
449-
go-version: "1.24"
450-
cache: true
438+
- uses: ./.github/actions/setup-go
451439
- run: make lint STATIC_FILES=false
452440
# if lint makes changes that are not in the PR, fail the build
453441
- name: Check if lint made changes not present in the PR
@@ -460,7 +448,7 @@ jobs:
460448
name: UI
461449
needs: [ changed-files ]
462450
if: ${{ needs.changed-files.outputs.ui == 'true' }}
463-
runs-on: ubuntu-24.04
451+
runs-on: ubuntu-latest
464452
timeout-minutes: 6
465453
env:
466454
NODE_OPTIONS: --max-old-space-size=4096

.github/workflows/dependabot-reviewer.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
permissions:
1212
pull-requests: write # for approving a PR
1313
contents: write # for enabling auto-merge on a PR
14-
runs-on: ubuntu-24.04
14+
runs-on: ubuntu-latest
1515
steps:
1616
- name: Dependabot metadata
1717
id: metadata

.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/pr.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ permissions:
1313

1414
jobs:
1515
title-check:
16-
runs-on: ubuntu-24.04
16+
runs-on: ubuntu-latest
1717
steps:
1818
- name: Check PR Title's semantic conformance
1919
uses: amannn/action-semantic-pull-request@0723387faaf9b38adef4775cd42cfd5155ed6017 # v5.5.3

.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:

.github/workflows/retest.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
if: github.event.issue.pull_request && github.event.comment.author_association == 'MEMBER' && github.event.comment.body == '/retest'
1313
permissions:
1414
actions: write # for re-running failed jobs: https://docs.github.com/en/rest/actions/workflow-runs?apiVersion=2022-11-28#re-run-a-job-from-a-workflow-run
15-
runs-on: ubuntu-24.04
15+
runs-on: ubuntu-latest
1616
steps:
1717
- name: Re-run failed jobs for this PR
1818
env:

.github/workflows/sdks.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
permissions:
1515
packages: write # for publishing packages
1616
contents: write # for creating releases
17-
runs-on: ubuntu-24.04
17+
runs-on: ubuntu-latest
1818
strategy:
1919
matrix:
2020
name:

0 commit comments

Comments
 (0)