From c990e3967770c7a79f7c56497e4293d6ef3eb19a Mon Sep 17 00:00:00 2001 From: Tom Lebreux Date: Mon, 23 Dec 2024 10:51:24 -0500 Subject: [PATCH 1/3] Update default charts branch to dev-v2.11 --- .github/workflows/release-charts.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-charts.yaml b/.github/workflows/release-charts.yaml index d1afe8ce0..6debe6172 100644 --- a/.github/workflows/release-charts.yaml +++ b/.github/workflows/release-charts.yaml @@ -5,7 +5,7 @@ on: charts_ref: description: "Submit PR against the following rancher/charts branch (eg: dev-v2.10)" required: true - default: "dev-v2.10" + default: "dev-v2.11" prev_webhook: description: "Previous Webhook version (eg: v0.5.0-rc.13)" required: true From ad9d2dee507367700b1d57ef17958c7c27555bb5 Mon Sep 17 00:00:00 2001 From: Tom Lebreux Date: Mon, 23 Dec 2024 10:51:46 -0500 Subject: [PATCH 2/3] Fix branch switch --- .github/workflows/release-charts.yaml | 2 +- .github/workflows/release-rancher.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-charts.yaml b/.github/workflows/release-charts.yaml index 6debe6172..af73252ae 100644 --- a/.github/workflows/release-charts.yaml +++ b/.github/workflows/release-charts.yaml @@ -51,8 +51,8 @@ jobs: - name: Checkout charts repository uses: actions/checkout@v4 with: - fetch-depth: 0 repository: ${{ github.repository_owner }}/charts + ref: "${{ env.CHARTS_REF }}" token: ${{ steps.app-token.outputs.token }} path: charts # Allow making git push request later on diff --git a/.github/workflows/release-rancher.yaml b/.github/workflows/release-rancher.yaml index 264c13403..2fe844280 100644 --- a/.github/workflows/release-rancher.yaml +++ b/.github/workflows/release-rancher.yaml @@ -51,8 +51,8 @@ jobs: - name: Checkout rancher repository uses: actions/checkout@v4 with: - fetch-depth: 0 repository: ${{ github.repository_owner }}/rancher + ref: "${{ env.RANCHER_REF }}" token: ${{ steps.app-token.outputs.token }} path: rancher # Allow making git push request later on From 4b60a4828ad7908c7e4847a1832b73ead08b0956 Mon Sep 17 00:00:00 2001 From: Tom Lebreux Date: Mon, 23 Dec 2024 10:57:01 -0500 Subject: [PATCH 3/3] Fix webhook branch fetch --- .github/workflows/release-charts.yaml | 3 ++- .github/workflows/release-rancher.yaml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-charts.yaml b/.github/workflows/release-charts.yaml index af73252ae..7a02b8d82 100644 --- a/.github/workflows/release-charts.yaml +++ b/.github/workflows/release-charts.yaml @@ -17,6 +17,7 @@ on: env: CHARTS_REF: ${{ github.event.inputs.charts_ref }} + WEBHOOK_REF: "${{ github.ref_name }}" PREV_WEBHOOK: ${{ github.event.inputs.prev_webhook }} NEW_WEBHOOK: ${{ github.event.inputs.new_webhook }} @@ -30,7 +31,7 @@ jobs: steps: - uses: actions/checkout@v4 with: - ref: ${{ github.event.inputs.ref }} + ref: "${{ env.WEBHOOK_REF }}" path: webhook - uses: rancher-eio/read-vault-secrets@main diff --git a/.github/workflows/release-rancher.yaml b/.github/workflows/release-rancher.yaml index 2fe844280..17982c8f0 100644 --- a/.github/workflows/release-rancher.yaml +++ b/.github/workflows/release-rancher.yaml @@ -17,6 +17,7 @@ on: env: RANCHER_REF: ${{ github.event.inputs.rancher_ref }} + WEBHOOK_REF: "${{ github.ref_name }}" PREV_WEBHOOK: ${{ github.event.inputs.prev_webhook }} NEW_WEBHOOK: ${{ github.event.inputs.new_webhook }} @@ -30,7 +31,7 @@ jobs: steps: - uses: actions/checkout@v4 with: - ref: ${{ github.event.inputs.ref }} + ref: "${{ env.WEBHOOK_REF }}" path: webhook - uses: rancher-eio/read-vault-secrets@main