Skip to content

Commit a2d83b4

Browse files
authored
chore(ci): Ensure "Build & Test" workflow runs on v7 (#10671)
1 parent 2a3a85b commit a2d83b4

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ on:
33
push:
44
branches:
55
- develop
6+
- v7
67
- master
78
- release/**
89
pull_request:
@@ -168,7 +169,8 @@ jobs:
168169
changed_browser_integration: ${{ steps.changed.outputs.browser_integration }}
169170
changed_any_code: ${{ steps.changed.outputs.any_code }}
170171
# Note: These next three have to be checked as strings ('true'/'false')!
171-
is_develop: ${{ github.ref == 'refs/heads/develop' }}
172+
# is_develop for v7 now also means we're on the `v7` branch.
173+
is_develop: ${{ github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/v7' }}
172174
is_release: ${{ startsWith(github.ref, 'refs/heads/release/') }}
173175
# When merging into master, or from master
174176
is_gitflow_sync: ${{ github.head_ref == 'master' || github.ref == 'refs/heads/master' }}
@@ -313,7 +315,7 @@ jobs:
313315
with:
314316
github_token: ${{ secrets.GITHUB_TOKEN }}
315317
skip_step: build
316-
main_branch: develop
318+
main_branch: v7
317319
# When on release branch, we want to always run
318320
# Else, we fall back to the default handling of the action
319321
run_for_branch: ${{ (needs.job_get_metadata.outputs.is_release == 'true' && 'true') || '' }}

0 commit comments

Comments
 (0)