Skip to content

Commit d6bb4a4

Browse files
author
pasha
committed
Merge branch 'master' of https://github.com/argoproj/argo-cd
2 parents ffb0715 + 13cd517 commit d6bb4a4

827 files changed

Lines changed: 70513 additions & 47080 deletions

File tree

Some content is hidden

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

.github/ISSUE_TEMPLATE/release.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ Target GA date: ___. __, ____
4141
Thanks to all the folks who spent their time contributing to this release in any way possible!
4242
```
4343
- [ ] Monitor support channels for issues, cherry-picking bugfixes and docs fixes as appropriate during the RC period (or delegate this task to an Approver and coordinate timing)
44+
- [ ] After creating the RC, open a documentation PR for the next minor version using [this](../../docs/operator-manual/templates/minor_version_upgrade.md) template.
4445
4546
## GA Release Checklist
4647

.github/configs/renovate-config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ module.exports = {
44
autodiscover: false,
55
allowPostUpgradeCommandTemplating: true,
66
allowedPostUpgradeCommands: ["make mockgen"],
7+
binarySource: 'install',
78
extends: [
89
"github>argoproj/argo-cd//renovate-presets/commons.json5",
910
"github>argoproj/argo-cd//renovate-presets/custom-managers/shell.json5",
Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
2-
"LABEL": {
3-
"name": "title needs formatting",
4-
"color": "EEEEEE"
5-
},
6-
"CHECKS": {
7-
"prefixes": ["[Bot] docs: "],
8-
"regexp": "^(feat|fix|docs|test|ci|chore)!?(\\(.*\\))?!?:.*"
9-
},
10-
"MESSAGES": {
11-
"success": "PR title is valid",
12-
"failure": "PR title is invalid",
13-
"notice": "PR Title needs to pass regex '^(feat|fix|docs|test|ci|chore)!?(\\(.*\\))?!?:.*"
14-
}
2+
"LABEL": {
3+
"name": "title needs formatting",
4+
"color": "EEEEEE"
5+
},
6+
"CHECKS": {
7+
"prefixes": ["[Bot] docs: "],
8+
"regexp": "^(refactor|feat|fix|docs|test|ci|chore)!?(\\(.*\\))?!?:.*"
9+
},
10+
"MESSAGES": {
11+
"success": "PR title is valid",
12+
"failure": "PR title is invalid",
13+
"notice": "PR Title needs to pass regex '^(refactor|feat|fix|docs|test|ci|chore)!?(\\(.*\\))?!?:.*"
1514
}
15+
}

.github/workflows/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
| release.yaml | Build images, cli-binaries, provenances, and post actions |
1212
| scorecard.yaml | Generate scorecard for supply-chain security |
1313
| update-snyk.yaml | Scheduled snyk reports |
14+
| stale.yaml | Labels stale issues and PRs |
1415

1516
# Reusable workflows
1617

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ jobs:
1010
contents: write # for peter-evans/create-pull-request to create branch
1111
pull-requests: write # for peter-evans/create-pull-request to create a PR
1212
name: Automatically update major version
13-
runs-on: ubuntu-22.04
13+
runs-on: ubuntu-24.04
1414
steps:
1515
- name: Checkout code
16-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
16+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
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/argo-cd
3838

3939
- name: Setup Golang
40-
uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
40+
uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
4141
with:
4242
go-version: ${{ env.GOLANG_VERSION }}
4343
- name: Add ~/go/bin to PATH
@@ -74,7 +74,7 @@ jobs:
7474
rsync -a --exclude=.git /home/runner/go/src/github.com/argoproj/argo-cd/ ../argo-cd
7575
7676
- name: Create pull request
77-
uses: peter-evans/create-pull-request@98357b18bf14b5342f975ff684046ec3b2a07725 # v8.0.0
77+
uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0 # v8.1.0
7878
with:
7979
commit-message: "Bump major version to ${{ steps.get-target-version.outputs.TARGET_VERSION }}"
8080
title: "Bump major version to ${{ steps.get-target-version.outputs.TARGET_VERSION }}"

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,17 @@ on:
2828
jobs:
2929
cherry-pick:
3030
name: Cherry Pick to ${{ inputs.version_number }}
31-
runs-on: ubuntu-latest
31+
runs-on: ubuntu-24.04
3232
steps:
3333
- name: Generate a token
3434
id: generate-token
35-
uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1
35+
uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
3636
with:
3737
app-id: ${{ secrets.CHERRYPICK_APP_ID }}
3838
private-key: ${{ secrets.CHERRYPICK_APP_PRIVATE_KEY }}
3939

4040
- name: Checkout repository
41-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
41+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4242
with:
4343
fetch-depth: 0
4444
token: ${{ steps.generate-token.outputs.token }}

.github/workflows/cherry-pick.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
(github.event.action == 'labeled' && startsWith(github.event.label.name, 'cherry-pick/')) ||
1515
(github.event.action == 'closed' && contains(toJSON(github.event.pull_request.labels.*.name), 'cherry-pick/'))
1616
)
17-
runs-on: ubuntu-latest
17+
runs-on: ubuntu-24.04
1818
outputs:
1919
labels: ${{ steps.extract-labels.outputs.labels }}
2020
steps:

0 commit comments

Comments
 (0)