Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix release rancher and release charts GHA workflows #575

Merged
merged 3 commits into from
Dec 23, 2024
Merged

Fix release rancher and release charts GHA workflows #575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c990e39
Update default charts branch to dev-v2.11
tomleb Dec 23, 2024
ad9d2de
Fix branch switch
tomleb Dec 23, 2024
4b60a48
Fix webhook branch fetch
tomleb Dec 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .github/workflows/release-charts.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 }}

Expand All @@ -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
Expand All @@ -51,8 +52,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
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/release-rancher.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

Expand All @@ -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
Expand All @@ -51,8 +52,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
Expand Down