Skip to content

Commit 064da0f

Browse files
authored
Fix clickhouse tests not running in the merge queue (tensorzero#5207)
* Fix clickhouse tests not running in the merge queue The 'if' check was checking a nonexistent variable, causing the job to get skipped in the merge queue. The 'check-all-general-jobs-passed' step is supposed to detect skipped jobs, but it didn't for some reason. I've fixed the check, and added debugging to 'check-all-general-jobs-passed' * Fix incorrect parenthesis
1 parent fdccd50 commit 064da0f

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

.github/workflows/general.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -734,8 +734,8 @@ jobs:
734734
# the main 'validate' job)
735735
runs-on: ${{ matrix.replicated && 'namespace-profile-tensorzero-8x16;ephemeral-storage.size-multiplier=2' || 'namespace-profile-tensorzero-8x16' }}
736736
continue-on-error: ${{ matrix.clickhouse_version.allow_failure }}
737-
# This needs to pull from Docker Hub, so skip for external PR CI
738-
if: ${{ (github.event.pull_request.head.repo.full_name == github.repository) || inputs.is_merge_group }}
737+
# This needs to pull from Docker Hub, so only run in the merge queue, or when running on a PR from the main repository
738+
if: ${{ github.event_name == 'merge_group' || (github.event.pull_request.head.repo.full_name == github.repository) }}
739739
strategy:
740740
matrix:
741741
# Only include replicated: true when running in merge queue
@@ -1176,7 +1176,11 @@ jobs:
11761176
]
11771177
runs-on: ubuntu-latest
11781178
steps:
1179+
- name: Print all job results
1180+
run: |
1181+
echo "'needs': ${{ toJson(needs) }}"
1182+
echo "github.event_name: ${{ github.event_name }}"
11791183
# When running in the merge queue, jobs should never be skipped.
11801184
# In PR CI, some jobs may be intentionally skipped (e.g. due to running from a fork, or to save money)
1181-
- if: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled' || (github.event_name == 'merge_group' && contains(needs.*.result, 'skipped'))) }}
1185+
- if: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') || (github.event_name == 'merge_group' && contains(needs.*.result, 'skipped')) }}
11821186
run: exit 1

0 commit comments

Comments
 (0)