From 1e4a78144afb2b98c2756363567a708d9c6059ae Mon Sep 17 00:00:00 2001 From: Max Williams Date: Mon, 6 Jan 2025 10:51:27 +0100 Subject: [PATCH 1/4] small updates to github actions --- .github/workflows/helm-publish.yaml | 3 ++- .gitignore | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/helm-publish.yaml b/.github/workflows/helm-publish.yaml index 1f5a457a..4baeb5b4 100644 --- a/.github/workflows/helm-publish.yaml +++ b/.github/workflows/helm-publish.yaml @@ -53,7 +53,7 @@ jobs: - name: Generate Helm repo index.yaml shell: bash run: | - helm repo index . + helm repo index --merge . - name: Update URLs in index.yaml with yq uses: mikefarah/yq@v4.44.6 with: @@ -65,4 +65,5 @@ jobs: committer_name: GitHub Actions committer_email: actions@github.com author_email: actions@github.com + author_name: GitHub Actions message: "$GITHUB_ACTION is updating index.yaml for $GITHUB_REF" diff --git a/.gitignore b/.gitignore index ec9864c9..37cf43d6 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,5 @@ __pycache__ .idea/ *.tmproj .vscode/ + +*.tgz From 588f0daf061267cb018837f5f191a8abb91327ef Mon Sep 17 00:00:00 2001 From: Brenno Oliveira Date: Mon, 6 Jan 2025 12:30:31 +0100 Subject: [PATCH 2/4] change add-and-commit to create-pull-request Signed-off-by: Brenno Oliveira --- .github/workflows/helm-publish.yaml | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/.github/workflows/helm-publish.yaml b/.github/workflows/helm-publish.yaml index 4baeb5b4..092133c7 100644 --- a/.github/workflows/helm-publish.yaml +++ b/.github/workflows/helm-publish.yaml @@ -58,12 +58,16 @@ jobs: uses: mikefarah/yq@v4.44.6 with: cmd: yq eval -i '. |= .entries[][] |= .urls[0] = "oci://" + env(REGISTRY) + "/" + .name + ":" + .version' index.yaml - - name: Commit index.yaml to master branch - uses: EndBug/add-and-commit@v9.1.4 + - name: Create Pull Request + id: cpr + uses: peter-evans/create-pull-request@v7 with: - add: 'index.yaml' - committer_name: GitHub Actions - committer_email: actions@github.com - author_email: actions@github.com - author_name: GitHub Actions - message: "$GITHUB_ACTION is updating index.yaml for $GITHUB_REF" + commit-message: "$GITHUB_ACTION is updating index.yaml for $GITHUB_REF" + branch: update-index + delete-branch: true + title: '[index] Updating for $GITHUB_REF' + add-paths: | + index.yaml + labels: | + index + automated pr From 9545932031600c152599174ded984cd30662f84d Mon Sep 17 00:00:00 2001 From: Brenno Oliveira Date: Mon, 6 Jan 2025 12:35:33 +0100 Subject: [PATCH 3/4] change PR title to pass check Signed-off-by: Brenno Oliveira --- .github/workflows/helm-publish.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/helm-publish.yaml b/.github/workflows/helm-publish.yaml index 092133c7..664d83a8 100644 --- a/.github/workflows/helm-publish.yaml +++ b/.github/workflows/helm-publish.yaml @@ -65,7 +65,7 @@ jobs: commit-message: "$GITHUB_ACTION is updating index.yaml for $GITHUB_REF" branch: update-index delete-branch: true - title: '[index] Updating for $GITHUB_REF' + title: '[stable/index] Updating index.yaml for $GITHUB_REF' add-paths: | index.yaml labels: | From 3e43899b07a4404d3330bd8a06a8bcab196521e7 Mon Sep 17 00:00:00 2001 From: Brenno Oliveira Date: Mon, 6 Jan 2025 13:36:04 +0100 Subject: [PATCH 4/4] fix quotes Signed-off-by: Brenno Oliveira --- .github/workflows/helm-publish.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/helm-publish.yaml b/.github/workflows/helm-publish.yaml index 664d83a8..dfd45dca 100644 --- a/.github/workflows/helm-publish.yaml +++ b/.github/workflows/helm-publish.yaml @@ -65,7 +65,7 @@ jobs: commit-message: "$GITHUB_ACTION is updating index.yaml for $GITHUB_REF" branch: update-index delete-branch: true - title: '[stable/index] Updating index.yaml for $GITHUB_REF' + title: "[stable/index] Updating index.yaml for $GITHUB_REF" add-paths: | index.yaml labels: |