Skip to content

Commit 06c40f2

Browse files
authored
Fix helm tests in release pipeline (#4126)
1 parent 9fbef71 commit 06c40f2

File tree

3 files changed

+10
-1
lines changed

3 files changed

+10
-1
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
- name: Checkout Repository
5151
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
5252
with:
53-
ref: ${{ (inputs.tag != '' && !inputs.dry_run ) && format('refs/tags/v{0}', inputs.tag) || github.ref }}
53+
ref: ${{ (inputs.tag != '' && !inputs.dry_run ) && format('refs/tags/{0}', inputs.tag) || github.ref }}
5454

5555
- name: Download Artifacts
5656
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -464,6 +464,7 @@ jobs:
464464
with:
465465
image: ${{ matrix.image }}
466466
k8s-version: ${{ matrix.k8s-version }}
467+
tag: ${{ inputs.release_version || '' }}
467468
secrets: inherit
468469
if: ${{ needs.vars.outputs.helm_changes == 'true' || github.event_name == 'schedule' }}
469470

.github/workflows/helm.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ on:
99
k8s-version:
1010
required: true
1111
type: string
12+
tag:
13+
required: false
14+
type: string
15+
default: ''
1216

1317
permissions:
1418
contents: read
@@ -44,6 +48,8 @@ jobs:
4448
type=edge
4549
type=schedule
4650
type=ref,event=pr
51+
type=ref,event=branch,suffix=-rc,enable=${{ startsWith(github.ref, 'refs/heads/release') && inputs.tag == '' }}
52+
type=raw,value=${{ inputs.tag }},enable=${{ inputs.tag != '' }}
4753
4854
- name: NGINX Docker meta
4955
id: nginx-meta
@@ -56,6 +62,8 @@ jobs:
5662
type=edge
5763
type=schedule
5864
type=ref,event=pr
65+
type=ref,event=branch,suffix=-rc,enable=${{ startsWith(github.ref, 'refs/heads/release') && inputs.tag == '' }}
66+
type=raw,value=${{ inputs.tag }},enable=${{ inputs.tag != '' }}
5967
6068
- name: Build NGF Docker Image
6169
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0

0 commit comments

Comments
 (0)