Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
3 changes: 2 additions & 1 deletion .github/workflows/cherry-pick.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,6 @@ jobs:
uses: carloscastrojumo/github-cherry-pick-action@503773289f4a459069c832dc628826685b75b4b3 # v1.0.10
with:
branch: ${{ steps.branch.outputs.branch }}
token: ${{ secrets.GITHUB_TOKEN }}
token: ${{ secrets.NGINX_PAT }}
author: ${{ github.actor }} <${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com>
title: "[cherry-pick] {old_title}"
47 changes: 23 additions & 24 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -340,30 +340,29 @@ jobs:
pyxis_token: ${{ secrets.PYXIS_API_TOKEN }}
preflight_version: 1.14.1

## Disable operator release step for now until nginx-bot issue is resolved, manually trigger workflow in nginx-ingress-helm-operator
# operator:
# if: ${{ ! cancelled() && ! failure() && ! inputs.dry_run && ! contains(inputs.skip_step, 'operator') && !contains(inputs.skip_step, 'publish-helm-chart') }}
# name: Trigger PR for Operator
# runs-on: ubuntu-24.04
# needs: [variables,publish-helm-chart]
# steps:
# - name:
# uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
# with:
# github-token: ${{ secrets.NGINX_PAT }}
# script: |
# await github.rest.actions.createWorkflowDispatch({
# owner: context.repo.owner,
# repo: 'nginx-ingress-helm-operator',
# workflow_id: 'sync-chart.yml',
# ref: 'main',
# inputs: {
# chart_version: '${{ inputs.chart_version }}',
# operator_version: '${{ inputs.operator_version }}',
# k8s_version: '${{ needs.variables.outputs.k8s_version }}',
# dry_run: '${{ inputs.dry_run }}'
# },
# })
operator:
if: ${{ ! cancelled() && ! failure() && ! inputs.dry_run && ! contains(inputs.skip_step, 'operator') && !contains(inputs.skip_step, 'publish-helm-chart') }}
name: Trigger PR for Operator
runs-on: ubuntu-24.04
needs: [variables,publish-helm-chart]
steps:
- name:
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
with:
github-token: ${{ secrets.NGINX_PAT }}
script: |
await github.rest.actions.createWorkflowDispatch({
owner: context.repo.owner,
repo: 'nginx-ingress-helm-operator',
workflow_id: 'sync-chart.yml',
ref: 'main',
inputs: {
chart_version: '${{ inputs.chart_version }}',
operator_version: '${{ inputs.operator_version }}',
k8s_version: '${{ needs.variables.outputs.k8s_version }}',
dry_run: '${{ inputs.dry_run }}'
},
})

## Disable GCP Marketplace step for now until a decision is made on how to handle GCP Marketplace with licensing
# gcp-marketplace:
Expand Down
Loading