Skip to content

Commit 6f3041d

Browse files
committed
Re-enable NGINX bot
1 parent 7bd6571 commit 6f3041d

File tree

2 files changed

+25
-25
lines changed

2 files changed

+25
-25
lines changed

.github/workflows/cherry-pick.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,6 @@ jobs:
3535
uses: carloscastrojumo/github-cherry-pick-action@503773289f4a459069c832dc628826685b75b4b3 # v1.0.10
3636
with:
3737
branch: ${{ steps.branch.outputs.branch }}
38-
token: ${{ secrets.GITHUB_TOKEN }}
38+
token: ${{ secrets.NGINX_PAT }}
39+
author: ${{ github.actor }} <${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com>
3940
title: "[cherry-pick] {old_title}"

.github/workflows/release.yml

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -340,30 +340,29 @@ jobs:
340340
pyxis_token: ${{ secrets.PYXIS_API_TOKEN }}
341341
preflight_version: 1.14.1
342342

343-
## Disable operator release step for now until nginx-bot issue is resolved, manually trigger workflow in nginx-ingress-helm-operator
344-
# operator:
345-
# if: ${{ ! cancelled() && ! failure() && ! inputs.dry_run && ! contains(inputs.skip_step, 'operator') && !contains(inputs.skip_step, 'publish-helm-chart') }}
346-
# name: Trigger PR for Operator
347-
# runs-on: ubuntu-24.04
348-
# needs: [variables,publish-helm-chart]
349-
# steps:
350-
# - name:
351-
# uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
352-
# with:
353-
# github-token: ${{ secrets.NGINX_PAT }}
354-
# script: |
355-
# await github.rest.actions.createWorkflowDispatch({
356-
# owner: context.repo.owner,
357-
# repo: 'nginx-ingress-helm-operator',
358-
# workflow_id: 'sync-chart.yml',
359-
# ref: 'main',
360-
# inputs: {
361-
# chart_version: '${{ inputs.chart_version }}',
362-
# operator_version: '${{ inputs.operator_version }}',
363-
# k8s_version: '${{ needs.variables.outputs.k8s_version }}',
364-
# dry_run: '${{ inputs.dry_run }}'
365-
# },
366-
# })
343+
operator:
344+
if: ${{ ! cancelled() && ! failure() && ! inputs.dry_run && ! contains(inputs.skip_step, 'operator') && !contains(inputs.skip_step, 'publish-helm-chart') }}
345+
name: Trigger PR for Operator
346+
runs-on: ubuntu-24.04
347+
needs: [variables,publish-helm-chart]
348+
steps:
349+
- name:
350+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
351+
with:
352+
github-token: ${{ secrets.NGINX_PAT }}
353+
script: |
354+
await github.rest.actions.createWorkflowDispatch({
355+
owner: context.repo.owner,
356+
repo: 'nginx-ingress-helm-operator',
357+
workflow_id: 'sync-chart.yml',
358+
ref: 'main',
359+
inputs: {
360+
chart_version: '${{ inputs.chart_version }}',
361+
operator_version: '${{ inputs.operator_version }}',
362+
k8s_version: '${{ needs.variables.outputs.k8s_version }}',
363+
dry_run: '${{ inputs.dry_run }}'
364+
},
365+
})
367366
368367
## Disable GCP Marketplace step for now until a decision is made on how to handle GCP Marketplace with licensing
369368
# gcp-marketplace:

0 commit comments

Comments
 (0)