Skip to content

Commit 6701da3

Browse files
committed
revert(ci): restore backend.yml to master state
1 parent 767ff8a commit 6701da3

File tree

1 file changed

+5
-14
lines changed

1 file changed

+5
-14
lines changed

.github/workflows/backend.yml

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -195,31 +195,23 @@ jobs:
195195
retention-days: 1
196196

197197
calculate-shards:
198+
# Use always() so this job runs even when prepare-selective-tests is skipped (master)
198199
if: >-
199200
always() &&
200201
!cancelled() &&
201202
needs.files-changed.outputs.backend == 'true'
202203
needs: [files-changed, prepare-selective-tests]
203204
name: calculate test shards
204205
runs-on: ubuntu-24.04
205-
timeout-minutes: ${{ needs.prepare-selective-tests.outputs.has-selected-tests == 'true' && 5 || 1 }}
206+
timeout-minutes: 5
206207
outputs:
207-
shard-count: ${{ steps.static-shards.outputs.shard-count || steps.calculate-shards.outputs.shard-count }}
208-
shard-indices: ${{ steps.static-shards.outputs.shard-indices || steps.calculate-shards.outputs.shard-indices }}
208+
shard-count: ${{ steps.calculate-shards.outputs.shard-count }}
209+
shard-indices: ${{ steps.calculate-shards.outputs.shard-indices }}
209210

210211
steps:
211-
- name: Use default shards (no selective testing)
212-
id: static-shards
213-
if: needs.prepare-selective-tests.outputs.has-selected-tests != 'true'
214-
run: |
215-
echo "shard-count=22" >> "$GITHUB_OUTPUT"
216-
echo "shard-indices=[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21]" >> "$GITHUB_OUTPUT"
217-
218212
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
219-
if: needs.prepare-selective-tests.outputs.has-selected-tests == 'true'
220213

221214
- name: Setup sentry env
222-
if: needs.prepare-selective-tests.outputs.has-selected-tests == 'true'
223215
uses: ./.github/actions/setup-sentry
224216
id: setup
225217
with:
@@ -235,9 +227,8 @@ jobs:
235227

236228
- name: Calculate test shards
237229
id: calculate-shards
238-
if: needs.prepare-selective-tests.outputs.has-selected-tests == 'true'
239230
env:
240-
SELECTED_TESTS_FILE: '.artifacts/selected-tests.txt'
231+
SELECTED_TESTS_FILE: ${{ needs.prepare-selective-tests.outputs.has-selected-tests == 'true' && '.artifacts/selected-tests.txt' || '' }}
241232
SELECTED_TEST_COUNT: ${{ needs.prepare-selective-tests.outputs.test-count || '' }}
242233
run: |
243234
python3 .github/workflows/scripts/calculate-backend-test-shards.py

0 commit comments

Comments
 (0)