Skip to content

Commit d9fd57a

Browse files
committed
Merge current engine main
2 parents f637684 + 4c9e763 commit d9fd57a

3 files changed

Lines changed: 9 additions & 8 deletions

File tree

‎.github/workflows/ci-post.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -529,13 +529,13 @@ jobs:
529529
# instrumentation propagates into every test binary (CMakeLists.txt option
530530
# PINEFORGE_ENABLE_SANITIZERS).
531531
sanitizers:
532-
name: sanitizers-shard (${{ matrix.shard }}/4)
532+
name: sanitizers-shard (${{ matrix.shard }}/8)
533533
needs: [authz, changes]
534534
if: ${{ always() && needs.authz.result == 'success' && (needs.changes.result != 'success' || needs.changes.outputs.docs_only != 'true') }}
535535
strategy:
536536
fail-fast: false
537537
matrix:
538-
shard: [1, 2, 3, 4]
538+
shard: [1, 2, 3, 4, 5, 6, 7, 8]
539539
runs-on: gke-32cpu-64gb-amd64-256gb
540540
env:
541541
ASAN_OPTIONS: detect_leaks=1:halt_on_error=1:abort_on_error=1
@@ -574,7 +574,7 @@ jobs:
574574
575575
- name: Verify (sanitizers)
576576
if: ${{ needs.authz.result == 'success' }}
577-
run: python3 scripts/ci_verify.py sanitizers --build-dir build-asan --jobs "$(getconf _NPROCESSORS_ONLN)" --ccache --ctest-shard ${{ matrix.shard }}/4
577+
run: python3 scripts/ci_verify.py sanitizers --build-dir build-asan --jobs "$(getconf _NPROCESSORS_ONLN)" --ccache --ctest-shard ${{ matrix.shard }}/8
578578

579579
- name: Stage and summarize diagnostics
580580
if: ${{ always() && needs.authz.result == 'success' }}
@@ -584,7 +584,7 @@ jobs:
584584
if: always()
585585
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
586586
with:
587-
name: ci-diagnostics-sanitizers-shard-${{ matrix.shard }}-of-4
587+
name: ci-diagnostics-sanitizers-shard-${{ matrix.shard }}-of-8
588588
path: ci-diagnostics/
589589
if-no-files-found: warn
590590

‎scripts/ci_preflight.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@
205205
' build_type: [Release, Debug]\n')
206206
BUILD_NAME = 'build (${{ matrix.platform.os }}, ${{ matrix.build_type }})'
207207
POST_ARM_BUILD_NAME = 'build (ubuntu-24.04-arm, ${{ matrix.build_type }})'
208-
POST_SHARDS = {'build': 4, 'build-debug': 2, 'sanitizers': 4, 'kernel-only': 2}
208+
POST_SHARDS = {'build': 4, 'build-debug': 2, 'sanitizers': 8, 'kernel-only': 2}
209209
POST_LEG_GATES = {
210210
'build-release-gate': ('build', 'build (ubuntu-24.04, Release)'),
211211
'build-debug-gate': ('build-debug', 'build (ubuntu-24.04, Debug)'),

‎scripts/test_ci_preflight.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ class ParallelCommand(tuple):
163163
(6, 'build', POST_BUILD_VERIFY + ' --ctest-shard ${{ matrix.shard }}/4'),
164164
(6, 'build-debug', POST_BUILD_VERIFY + ' --ctest-shard ${{ matrix.shard }}/2'),
165165
(6, 'sanitizers', 'run: python3 scripts/ci_verify.py sanitizers --build-dir build-asan '
166-
'--jobs "$(getconf _NPROCESSORS_ONLN)" --ccache --ctest-shard ${{ matrix.shard }}/4'),
166+
'--jobs "$(getconf _NPROCESSORS_ONLN)" --ccache --ctest-shard ${{ matrix.shard }}/8'),
167167
(6, 'kernel-only', KERNEL_VERIFY),
168168
(1, 'native-live-shards',
169169
'run: python3 scripts/ci_verify.py ${{ matrix.profile }} --build-dir ${{ matrix.build_dir }} '
@@ -2524,7 +2524,7 @@ def test_post_fleet_docs_refuse_same_size_wrong_protected_runner(self):
25242524
'build (ubuntu-24.04, Release)'),
25252525
('build-debug', 'debug', 2, GKE_16_128, 'build-debug-gate',
25262526
'build (ubuntu-24.04, Debug)'),
2527-
('sanitizers', 'sanitizers', 4, GKE_32_256, 'sanitizers-gate', 'sanitizers'),
2527+
('sanitizers', 'sanitizers', 8, GKE_32_256, 'sanitizers-gate', 'sanitizers'),
25282528
('kernel-only', 'kernel', 2, GKE_16, 'kernel-only-gate', 'kernel-only'),
25292529
)
25302530

@@ -2610,7 +2610,8 @@ def test_shard_denominators_must_match_the_pinned_matrix(self):
26102610
spelled = in_job(source, job, flag, spelling)
26112611
self.assertNotIn(f'ci-post.yml {job} must pass {flag} exactly once to ci_verify',
26122612
ci_preflight.runner_findings({'ci-post.yml': spelled}))
2613-
for replacement in ('', spelling.replace(f'/{count}', '/8'),
2613+
wrong_count = 4 if count == 8 else 8
2614+
for replacement in ('', spelling.replace(f'/{count}', f'/{wrong_count}'),
26142615
'--ctest-shard 1/1', spelling + ' ' + spelling):
26152616
with self.subTest(job=job, spelling=spelling, flag=replacement):
26162617
changed = in_job(spelled, job, spelling, replacement)

0 commit comments

Comments
 (0)