Skip to content

Commit d4f3cd2

Browse files
authored
Merge branch 'main' into feat/add-ignore-missing
2 parents 78a928f + 5a64c50 commit d4f3cd2

File tree

565 files changed

+6651
-6670
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

565 files changed

+6651
-6670
lines changed

.devcontainer/devcontainer.json

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

.github/workflows/ci-build.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ jobs:
117117
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
118118
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
119119
with:
120-
go-version: "1.23"
120+
go-version: "1.24"
121121
cache: true
122122
- run: make test STATIC_FILES=false GOTEST='go test -p 20 -covermode=atomic -coverprofile=coverage.out'
123123
- name: Upload coverage report
@@ -139,7 +139,7 @@ jobs:
139139
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
140140
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
141141
with:
142-
go-version: "1.23"
142+
go-version: "1.24"
143143
cache: true
144144
# windows run does not use makefile target because it does a lot more than just testing and is not cross-platform compatible
145145
- run: if (!(Test-Path "ui/dist/app/index.html")) { New-Item -ItemType Directory -Force -Path "ui/dist/app" | Out-Null; New-Item -ItemType File -Path "ui/dist/app/placeholder" | Out-Null }; 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)
@@ -170,7 +170,7 @@ jobs:
170170
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
171171
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
172172
with:
173-
go-version: "1.23"
173+
go-version: "1.24"
174174
cache: true
175175
- name: Build
176176
run: make ${{matrix.target}}
@@ -283,7 +283,7 @@ jobs:
283283
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
284284
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
285285
with:
286-
go-version: "1.23"
286+
go-version: "1.24"
287287
cache: true
288288
- name: Install Java for the SDK
289289
if: ${{matrix.test == 'test-java-sdk'}}
@@ -435,7 +435,7 @@ jobs:
435435
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
436436
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
437437
with:
438-
go-version: "1.23"
438+
go-version: "1.24"
439439
cache: true
440440
- name: Install protoc
441441
run: |
@@ -472,7 +472,7 @@ jobs:
472472
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
473473
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
474474
with:
475-
go-version: "1.23"
475+
go-version: "1.24"
476476
cache: true
477477
- run: make lint STATIC_FILES=false
478478
# if lint makes changes that are not in the PR, fail the build

.github/workflows/docs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
python-version: 3.9
2727
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
2828
with:
29-
go-version: '1.23'
29+
go-version: "1.24"
3030
- uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
3131
with:
3232
node-version: "19"

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ jobs:
291291
node-version: "20" # change in all GH Workflows
292292
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
293293
with:
294-
go-version: "1.23"
294+
go-version: "1.24"
295295
- name: Restore node packages cache
296296
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
297297
with:

.golangci.yml

Lines changed: 66 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
# https://golangci-lint.run/usage/quick-start/
1+
version: "2"
22
run:
3-
timeout: 12m
43
build-tags:
54
- api
65
- cli
@@ -17,13 +16,7 @@ linters:
1716
- bodyclose
1817
- copyloopvar
1918
- errcheck
20-
- goimports
21-
# only minor issues
22-
# - errorlint
23-
# seems to have bugs in recent version, also slow
24-
# - gci
2519
- gosec
26-
- gosimple
2720
- govet
2821
- ineffassign
2922
- misspell
@@ -34,34 +27,70 @@ linters:
3427
- sqlclosecheck
3528
- staticcheck
3629
- testifylint
37-
- typecheck
3830
- unparam
3931
- unused
40-
linters-settings:
41-
goimports:
42-
local-prefixes: github.com/argoproj/argo-workflows/
43-
gosec:
44-
includes:
45-
- G304
46-
- G307
47-
excludes:
48-
# G106: Use of ssh InsecureIgnoreHostKey should be audited
49-
- G106
50-
# G402: TLS InsecureSkipVerify set true
51-
- G402
52-
# G601: Implicit memory aliasing in for loop.
53-
- G601
54-
issues:
55-
exclude-rules:
56-
- path: server/artifacts/artifact_server_test.go
57-
text: "response body must be closed"
58-
exclude-dirs:
59-
- dist
60-
- docs
61-
- examples
62-
- hack
63-
- manifests
64-
- pkg/client
65-
- sdks
66-
- ui
67-
- vendor
32+
settings:
33+
gosec:
34+
includes:
35+
- G304
36+
- G307
37+
excludes:
38+
# G106: Use of ssh InsecureIgnoreHostKey should be audited
39+
- G106
40+
# G402: TLS InsecureSkipVerify set true
41+
- G402
42+
staticcheck:
43+
checks:
44+
- all
45+
# Capitalised variable names
46+
- "-ST1003"
47+
# Capitalised error strings
48+
- "-ST1005"
49+
# Receiver names
50+
- "-ST1016"
51+
exclusions:
52+
generated: lax
53+
presets:
54+
- comments
55+
- common-false-positives
56+
- legacy
57+
- std-error-handling
58+
rules:
59+
- path: server/artifacts/artifact_server_test.go
60+
text: response body must be closed
61+
paths:
62+
- dist
63+
- docs
64+
- examples
65+
- hack
66+
- manifests
67+
- pkg/client
68+
- sdks
69+
- ui
70+
- vendor
71+
- third_party$
72+
- builtin$
73+
- examples$
74+
formatters:
75+
enable:
76+
- gofmt
77+
- goimports
78+
settings:
79+
goimports:
80+
local-prefixes:
81+
- github.com/argoproj/argo-workflows/
82+
exclusions:
83+
generated: lax
84+
paths:
85+
- dist
86+
- docs
87+
- examples
88+
- hack
89+
- manifests
90+
- pkg/client
91+
- sdks
92+
- ui
93+
- vendor
94+
- third_party$
95+
- builtin$
96+
- examples$

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.23-alpine3.19 as builder
6+
FROM golang:1.24-alpine3.21 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.23
14+
ENV GOLANG_VERSION=1.24
1515
SHELL ["powershell", "-Command"]
1616

1717
# install chocolatey package manager

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ swagger: \
317317
$(TOOL_MOCKERY): Makefile
318318
# update this in Nix when upgrading it here
319319
ifneq ($(USE_NIX), true)
320-
go install github.com/vektra/mockery/v2@v2.42.2
320+
go install github.com/vektra/mockery/v2@v2.53.3
321321
endif
322322
$(TOOL_CONTROLLER_GEN): Makefile
323323
# update this in Nix when upgrading it here
@@ -474,7 +474,7 @@ manifests-validate:
474474
kubectl apply --server-side --validate=strict --dry-run=server -f 'manifests/*.yaml'
475475

476476
$(TOOL_GOLANGCI_LINT): Makefile
477-
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b `go env GOPATH`/bin v1.61.0
477+
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b `go env GOPATH`/bin v2.1.1
478478

479479
.PHONY: lint
480480
lint: ui/dist/app/index.html $(TOOL_GOLANGCI_LINT)

0 commit comments

Comments
 (0)