From 96b9602f5ce954fc3bfc22571eea30a80a19b886 Mon Sep 17 00:00:00 2001 From: Jordan Dubrick Date: Thu, 14 May 2026 16:12:21 -0400 Subject: [PATCH] chore(lightspeed): update lightspeed sync workflow to handle release branch Signed-off-by: Jordan Dubrick --- .../workflows/sync-lightspeed-configs.yaml | 29 ++++++++++++------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/.github/workflows/sync-lightspeed-configs.yaml b/.github/workflows/sync-lightspeed-configs.yaml index 83f9191d..f8f00f84 100644 --- a/.github/workflows/sync-lightspeed-configs.yaml +++ b/.github/workflows/sync-lightspeed-configs.yaml @@ -5,15 +5,22 @@ on: - cron: '0 4 * * *' workflow_dispatch: -concurrency: - group: ${{ github.workflow }} - cancel-in-progress: true - jobs: sync-lightspeed: - name: Sync Lightspeed Configs + name: Sync Lightspeed Configs (${{ matrix.branch }}) runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + branch: + - main + - release-1.10 + + concurrency: + group: ${{ github.workflow }}-${{ matrix.branch }} + cancel-in-progress: true + permissions: contents: write pull-requests: write @@ -22,6 +29,7 @@ jobs: - name: Checkout uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 with: + ref: ${{ matrix.branch }} fetch-depth: 0 - name: Set up Helm @@ -53,7 +61,7 @@ jobs: git config user.email "41898282+github-actions[bot]@users.noreply.github.com" - name: Sync Lightspeed config files - run: ./hack/sync-lightspeed-configs.sh + run: ./hack/sync-lightspeed-configs.sh --ref ${{ matrix.branch }} - name: Check for changes id: changes @@ -97,11 +105,12 @@ jobs: env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} NEW_VERSION: ${{ steps.semver.outputs.new_version }} + TARGET_BRANCH: ${{ matrix.branch }} run: | TITLE="chore(lightspeed): sync config files and bump chart to ${NEW_VERSION}" - BRANCH="chore/sync-lightspeed-configs" + BRANCH="chore/sync-lightspeed-configs-${TARGET_BRANCH}" - EXISTING_PR=$(gh pr list --head "${BRANCH}" --state open --json number --jq '.[0].number // empty') + EXISTING_PR=$(gh pr list --head "${BRANCH}" --base "${TARGET_BRANCH}" --state open --json number --jq '.[0].number // empty') git checkout -b "${BRANCH}" @@ -119,7 +128,7 @@ jobs: git push origin "${BRANCH}" BODY=$(cat <