Skip to content

Commit e84550b

Browse files
volneiPeerRich
andauthored
chore: Isolate companion build (calcom#25985)
* Isolate companion build * Fix typo * Update .github/workflows/pr.yml * Improve branch protection * integration tests missing * fix typo * fix to only have required * fix to only have required * fix to only have required * adjust to keep as before --------- Co-authored-by: Peer Richelsen <peeroke@gmail.com>
1 parent e6d0253 commit e84550b

1 file changed

Lines changed: 20 additions & 5 deletions

File tree

.github/workflows/pr.yml

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ jobs:
2424
pull-requests: read
2525
outputs:
2626
has-files-requiring-all-checks: ${{ steps.filter.outputs.has-files-requiring-all-checks }}
27+
has_companion: ${{ steps.filter.outputs.has_companion }}
2728
commit-sha: ${{ steps.get_sha.outputs.commit-sha }}
2829
steps:
2930
- uses: actions/checkout@v4
@@ -33,7 +34,9 @@ jobs:
3334
with:
3435
filters: |
3536
has-files-requiring-all-checks:
36-
- "!(**.md|**.mdx|.github/CODEOWNERS|docs/**|help/**|apps/web/public/static/locales/**/common.json|i18n.lock)"
37+
- "!(companion/**|**.md|**.mdx|.github/CODEOWNERS|docs/**|help/**|apps/web/public/static/locales/**/common.json|i18n.lock)"
38+
has_companion:
39+
- "companion/**"
3740
- name: Get Latest Commit SHA
3841
id: get_sha
3942
run: |
@@ -148,8 +151,8 @@ jobs:
148151

149152
build-companion:
150153
name: Companion builds
151-
needs: [changes, check-label, deps]
152-
if: ${{ needs.check-label.outputs.run-e2e == 'true' && needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
154+
needs: [changes, check-label]
155+
if: needs.changes.outputs.has_companion == 'true'
153156
uses: ./.github/workflows/companion-build.yml
154157
secrets: inherit
155158

@@ -256,11 +259,23 @@ jobs:
256259
e2e-api-v2,
257260
e2e-embed,
258261
e2e-embed-react,
259-
e2e-app-store
262+
e2e-app-store,
260263
]
261264
if: always()
262265
runs-on: buildjet-2vcpu-ubuntu-2204
263266
steps:
264267
- name: fail if conditional jobs failed
265-
if: needs.changes.outputs.has-files-requiring-all-checks == 'true' && (contains(needs.*.result, 'failure') || contains(needs.*.result, 'skipped') || contains(needs.*.result, 'cancelled'))
266268
run: exit 1
269+
if: |
270+
(
271+
needs.changes.outputs.has-files-requiring-all-checks == 'true' &&
272+
(
273+
contains(needs.*.result, 'failure') ||
274+
contains(needs.*.result, 'cancelled') ||
275+
contains(needs.*.result, 'skipped')
276+
)
277+
) ||
278+
(
279+
needs.changes.outputs.has_companion == 'true' &&
280+
needs.build-companion.result != 'success'
281+
)

0 commit comments

Comments
 (0)