From 484346ffcc89082ae09dbfa9386a62c71359812a Mon Sep 17 00:00:00 2001 From: Matheus Pimenta Date: Thu, 12 Mar 2026 16:33:04 +0000 Subject: [PATCH] Add target branch name to update branch Signed-off-by: Matheus Pimenta --- .github/workflows/README.md | 2 +- .github/workflows/conformance.yaml | 2 +- .github/workflows/update.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/README.md b/.github/workflows/README.md index 79ca735a..95bdc83d 100644 --- a/.github/workflows/README.md +++ b/.github/workflows/README.md @@ -23,7 +23,7 @@ amd when it finds a new controller version, the workflow performs the following - Updates the controller API package version in `go.mod`. - Patches the controller CRDs version in the `manifests/crds` overlay. - Patches the controller Deployment version in `manifests/bases` overlay. -- Opens a Pull Request against the `main` branch. +- Opens a Pull Request against the checked out branch. - Triggers the e2e test suite to run for the opened PR. diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml index 9b66001f..ea981adc 100644 --- a/.github/workflows/conformance.yaml +++ b/.github/workflows/conformance.yaml @@ -3,7 +3,7 @@ name: conformance on: workflow_dispatch: push: - branches: [ 'main', 'update-components', 'release/**', 'conform*' ] + branches: [ 'main', 'update-components-**', 'release/**', 'conform*' ] permissions: contents: read diff --git a/.github/workflows/update.yaml b/.github/workflows/update.yaml index c92290fc..5ae821fb 100644 --- a/.github/workflows/update.yaml +++ b/.github/workflows/update.yaml @@ -106,7 +106,7 @@ jobs: committer: GitHub author: fluxcdbot signoff: true - branch: update-components + branch: update-components-${{ github.ref_name }} title: Update toolkit components body: | ${{ steps.update.outputs.pr_body }}