Skip to content

Commit d684ed9

Browse files
authored
chore(lightspeed): update lightspeed sync workflow to handle release branch (#397)
Signed-off-by: Jordan Dubrick <jdubrick@redhat.com>
1 parent 09a4e74 commit d684ed9

1 file changed

Lines changed: 19 additions & 10 deletions

File tree

.github/workflows/sync-lightspeed-configs.yaml

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,22 @@ on:
55
- cron: '0 4 * * *'
66
workflow_dispatch:
77

8-
concurrency:
9-
group: ${{ github.workflow }}
10-
cancel-in-progress: true
11-
128
jobs:
139
sync-lightspeed:
14-
name: Sync Lightspeed Configs
10+
name: Sync Lightspeed Configs (${{ matrix.branch }})
1511
runs-on: ubuntu-latest
1612

13+
strategy:
14+
fail-fast: false
15+
matrix:
16+
branch:
17+
- main
18+
- release-1.10
19+
20+
concurrency:
21+
group: ${{ github.workflow }}-${{ matrix.branch }}
22+
cancel-in-progress: true
23+
1724
permissions:
1825
contents: write
1926
pull-requests: write
@@ -22,6 +29,7 @@ jobs:
2229
- name: Checkout
2330
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
2431
with:
32+
ref: ${{ matrix.branch }}
2533
fetch-depth: 0
2634

2735
- name: Set up Helm
@@ -53,7 +61,7 @@ jobs:
5361
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
5462
5563
- name: Sync Lightspeed config files
56-
run: ./hack/sync-lightspeed-configs.sh
64+
run: ./hack/sync-lightspeed-configs.sh --ref ${{ matrix.branch }}
5765

5866
- name: Check for changes
5967
id: changes
@@ -97,11 +105,12 @@ jobs:
97105
env:
98106
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
99107
NEW_VERSION: ${{ steps.semver.outputs.new_version }}
108+
TARGET_BRANCH: ${{ matrix.branch }}
100109
run: |
101110
TITLE="chore(lightspeed): sync config files and bump chart to ${NEW_VERSION}"
102-
BRANCH="chore/sync-lightspeed-configs"
111+
BRANCH="chore/sync-lightspeed-configs-${TARGET_BRANCH}"
103112
104-
EXISTING_PR=$(gh pr list --head "${BRANCH}" --state open --json number --jq '.[0].number // empty')
113+
EXISTING_PR=$(gh pr list --head "${BRANCH}" --base "${TARGET_BRANCH}" --state open --json number --jq '.[0].number // empty')
105114
106115
git checkout -b "${BRANCH}"
107116
@@ -119,7 +128,7 @@ jobs:
119128
git push origin "${BRANCH}"
120129
121130
BODY=$(cat <<EOF
122-
Automated nightly sync of Lightspeed config files from [redhat-ai-dev/lightspeed-configs](https://github.com/redhat-ai-dev/lightspeed-configs).
131+
Automated nightly sync of Lightspeed config files from [redhat-ai-dev/lightspeed-configs @ ${TARGET_BRANCH}](https://github.com/redhat-ai-dev/lightspeed-configs/tree/${TARGET_BRANCH}).
123132
124133
Bumped chart version to **${NEW_VERSION}**.
125134
@@ -137,5 +146,5 @@ jobs:
137146
gh pr create \
138147
--title "${TITLE}" \
139148
--body "${BODY}" \
140-
--base "${{ github.ref_name }}"
149+
--base "${TARGET_BRANCH}"
141150
fi

0 commit comments

Comments
 (0)