Skip to content

Commit 7b8c36a

Browse files
committed
Merge branch 'master' of https://github.com/reggie-k/argo-cd
2 parents 06c1dd7 + d4f7f13 commit 7b8c36a

Some content is hidden

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

63 files changed

+483
-110
lines changed

.github/ISSUE_TEMPLATE/release.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ Target GA date: ___. __, ____
2323
- [ ] Verify the release on [GitHub releases](https://github.com/argoproj/argo-cd/releases)
2424
- [ ] Verify the container image on [Quay.io](https://quay.io/repository/argoproj/argocd?tab=tags)
2525
- [ ] Confirm the new version appears in [Read the Docs](https://argo-cd.readthedocs.io/)
26+
- [ ] Verify the docs release build in https://app.readthedocs.org/projects/argo-cd/ succeeded and retry if failed (requires an Approver with admin creds to readthedocs)
2627
- [ ] Announce RC1 release
2728
- [ ] Confirm that tweet and blog post are ready
2829
- [ ] Publish tweet and blog post
@@ -64,6 +65,7 @@ Target GA date: ___. __, ____
6465
- [ ] Verify the container image on [Quay.io](https://quay.io/repository/argoproj/argocd?tab=tags)
6566
- [ ] Verify the `stable` tag has been updated
6667
- [ ] Confirm the new version appears in [Read the Docs](https://argo-cd.readthedocs.io/)
68+
- [ ] Verify the docs release build in https://app.readthedocs.org/projects/argo-cd/ succeeded and retry if failed (requires an Approver with admin creds to readthedocs)
6769
- [ ] Announce GA release with EOL notice
6870
- [ ] Confirm that tweet and blog post are ready
6971
- [ ] Publish tweet and blog post
@@ -81,4 +83,4 @@ Target GA date: ___. __, ____
8183
Thanks to all the folks who spent their time contributing to this release in any way possible!
8284
```
8385
- [ ] (For the next release champion) Review the [items scheduled for the next release](https://github.com/orgs/argoproj/projects/25). If any item does not have an assignee who can commit to finish the feature, move it to the next release.
84-
- [ ] (For the next release champion) Schedule a time mid-way through the release cycle to review items again.
86+
- [ ] (For the next release champion) Schedule a time mid-way through the release cycle to review items again.

.github/workflows/bump-major-version.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-22.04
1414
steps:
1515
- name: Checkout code
16-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
16+
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
1717
with:
1818
fetch-depth: 0
1919
token: ${{ secrets.GITHUB_TOKEN }}
@@ -37,7 +37,7 @@ jobs:
3737
working-directory: /home/runner/go/src/github.com/argoproj/${{ github.event.repository.name }}
3838

3939
- name: Setup Golang
40-
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
40+
uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
4141
with:
4242
go-version: ${{ env.GOLANG_VERSION }}
4343
- name: Add ~/go/bin to PATH

.github/workflows/cherry-pick-single.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
private-key: ${{ secrets.CHERRYPICK_APP_PRIVATE_KEY }}
3939

4040
- name: Checkout repository
41-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
41+
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
4242
with:
4343
fetch-depth: 0
4444
token: ${{ steps.generate-token.outputs.token }}

.github/workflows/ci-build.yaml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
frontend: ${{ steps.filter.outputs.frontend_any_changed }}
3232
docs: ${{ steps.filter.outputs.docs_any_changed }}
3333
steps:
34-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
34+
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
3535
- uses: tj-actions/changed-files@24d32ffd492484c1d75e0c0b894501ddb9d30d62 # v47.0.0
3636
id: filter
3737
with:
@@ -55,9 +55,9 @@ jobs:
5555
- changes
5656
steps:
5757
- name: Checkout code
58-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
58+
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
5959
- name: Setup Golang
60-
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
60+
uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
6161
with:
6262
go-version: ${{ env.GOLANG_VERSION }}
6363
- name: Download all Go modules
@@ -75,9 +75,9 @@ jobs:
7575
- changes
7676
steps:
7777
- name: Checkout code
78-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
78+
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
7979
- name: Setup Golang
80-
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
80+
uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
8181
with:
8282
go-version: ${{ env.GOLANG_VERSION }}
8383
- name: Restore go build cache
@@ -102,9 +102,9 @@ jobs:
102102
- changes
103103
steps:
104104
- name: Checkout code
105-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
105+
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
106106
- name: Setup Golang
107-
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
107+
uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
108108
with:
109109
go-version: ${{ env.GOLANG_VERSION }}
110110
- name: Run golangci-lint
@@ -128,11 +128,11 @@ jobs:
128128
- name: Create checkout directory
129129
run: mkdir -p ~/go/src/github.com/argoproj
130130
- name: Checkout code
131-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
131+
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
132132
- name: Create symlink in GOPATH
133133
run: ln -s $(pwd) ~/go/src/github.com/argoproj/${{ github.event.repository.name }}
134134
- name: Setup Golang
135-
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
135+
uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
136136
with:
137137
go-version: ${{ env.GOLANG_VERSION }}
138138
- name: Install required packages
@@ -192,11 +192,11 @@ jobs:
192192
- name: Create checkout directory
193193
run: mkdir -p ~/go/src/github.com/argoproj
194194
- name: Checkout code
195-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
195+
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
196196
- name: Create symlink in GOPATH
197197
run: ln -s $(pwd) ~/go/src/github.com/argoproj/${{ github.event.repository.name }}
198198
- name: Setup Golang
199-
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
199+
uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
200200
with:
201201
go-version: ${{ env.GOLANG_VERSION }}
202202
- name: Install required packages
@@ -250,9 +250,9 @@ jobs:
250250
- changes
251251
steps:
252252
- name: Checkout code
253-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
253+
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
254254
- name: Setup Golang
255-
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
255+
uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
256256
with:
257257
go-version: ${{ env.GOLANG_VERSION }}
258258
- name: Create symlink in GOPATH
@@ -302,7 +302,7 @@ jobs:
302302
- changes
303303
steps:
304304
- name: Checkout code
305-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
305+
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
306306
- name: Setup NodeJS
307307
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
308308
with:
@@ -335,7 +335,7 @@ jobs:
335335
shellcheck:
336336
runs-on: ubuntu-latest
337337
steps:
338-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
338+
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
339339
- run: |
340340
sudo apt-get install shellcheck
341341
shellcheck -e SC2059 -e SC2154 -e SC2034 -e SC2016 -e SC1091 $(find . -type f -name '*.sh' | grep -v './ui/node_modules') | tee sc.log
@@ -354,7 +354,7 @@ jobs:
354354
sonar_secret: ${{ secrets.SONAR_TOKEN }}
355355
steps:
356356
- name: Checkout code
357-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
357+
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
358358
with:
359359
fetch-depth: 0
360360
- name: Restore node dependency cache
@@ -446,9 +446,9 @@ jobs:
446446
swap-storage: false
447447
tool-cache: false
448448
- name: Checkout code
449-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
449+
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
450450
- name: Setup Golang
451-
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
451+
uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
452452
with:
453453
go-version: ${{ env.GOLANG_VERSION }}
454454
- name: GH actions workaround - Kill XSP4 process
@@ -495,7 +495,7 @@ jobs:
495495
run: |
496496
docker pull ghcr.io/dexidp/dex:v2.43.0
497497
docker pull argoproj/argo-cd-ci-builder:v1.0.0
498-
docker pull redis:8.2.1-alpine
498+
docker pull redis:8.2.3-alpine
499499
- name: Create target directory for binaries in the build-process
500500
run: |
501501
mkdir -p dist

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ jobs:
2929
runs-on: ubuntu-22.04
3030
steps:
3131
- name: Checkout repository
32-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
32+
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
3333

3434
# Use correct go version. https://github.com/github/codeql-action/issues/1842#issuecomment-1704398087
3535
- name: Setup Golang
36-
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
36+
uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
3737
with:
3838
go-version-file: go.mod
3939

.github/workflows/image-reuse.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,18 +56,18 @@ jobs:
5656
image-digest: ${{ steps.image.outputs.digest }}
5757
steps:
5858
- name: Checkout code
59-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
59+
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
6060
with:
6161
fetch-depth: 0
6262
token: ${{ secrets.GITHUB_TOKEN }}
6363
if: ${{ github.ref_type == 'tag'}}
6464

6565
- name: Checkout code
66-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
66+
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
6767
if: ${{ github.ref_type != 'tag'}}
6868

6969
- name: Setup Golang
70-
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
70+
uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
7171
with:
7272
go-version: ${{ inputs.go-version }}
7373
cache: false

.github/workflows/image.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
ghcr_image_name: ${{ steps.image.outputs.ghcr_image_name }}
3333
ghcr_provenance_image: ${{ steps.image.outputs.ghcr_provenance_image }}
3434
steps:
35-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
35+
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
3636

3737
- name: Set image tag and names
3838
run: |
@@ -146,7 +146,7 @@ jobs:
146146
if: ${{ github.repository == 'argoproj/argo-cd' && github.event_name == 'push' }}
147147
runs-on: ubuntu-22.04
148148
steps:
149-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
149+
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
150150
- run: git clone "https://$TOKEN@github.com/argoproj/argoproj-deployments"
151151
env:
152152
TOKEN: ${{ secrets.TOKEN }}

.github/workflows/init-release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
runs-on: ubuntu-22.04
2424
steps:
2525
- name: Checkout code
26-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
26+
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
2727
with:
2828
fetch-depth: 0
2929
token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
sbom_image: ${{ steps.var.outputs.sbom_image }}
5050
steps:
5151
- name: Checkout code
52-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
52+
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
5353
with:
5454
fetch-depth: 0
5555
token: ${{ secrets.GITHUB_TOKEN }}
@@ -122,7 +122,7 @@ jobs:
122122
hashes: ${{ steps.hash.outputs.hashes }}
123123
steps:
124124
- name: Checkout code
125-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
125+
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
126126
with:
127127
fetch-depth: 0
128128
token: ${{ secrets.GITHUB_TOKEN }}
@@ -131,7 +131,7 @@ jobs:
131131
run: git fetch --force --tags
132132

133133
- name: Setup Golang
134-
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
134+
uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
135135
with:
136136
go-version: ${{ env.GOLANG_VERSION }}
137137
cache: false
@@ -209,13 +209,13 @@ jobs:
209209
runs-on: ubuntu-22.04
210210
steps:
211211
- name: Checkout code
212-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
212+
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
213213
with:
214214
fetch-depth: 0
215215
token: ${{ secrets.GITHUB_TOKEN }}
216216

217217
- name: Setup Golang
218-
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
218+
uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
219219
with:
220220
go-version: ${{ env.GOLANG_VERSION }}
221221
cache: false
@@ -296,7 +296,7 @@ jobs:
296296
TAG_STABLE: ${{ needs.setup-variables.outputs.is_latest_release }}
297297
steps:
298298
- name: Checkout code
299-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
299+
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
300300
with:
301301
fetch-depth: 0
302302
token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/renovate.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ jobs:
2020
private-key: ${{ secrets.RENOVATE_APP_PRIVATE_KEY }}
2121

2222
- name: Checkout
23-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # 5.0.0
23+
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # 5.0.1
2424

2525
# Some codegen commands require Go to be setup
2626
- name: Setup Golang
27-
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
27+
uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
2828
with:
2929
# renovate: datasource=golang-version packageName=golang
3030
go-version: 1.25.3

0 commit comments

Comments
 (0)