diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 4b133a66d34..5a6f7885604 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -81,6 +81,9 @@ jobs: if: steps.scope.outputs.needed == 'true' run: | rm -rf target/cargo-timings + if [[ "$GITHUB_EVENT_NAME" == merge_group ]]; then + export NEXTEST_TEST_THREADS=24 + fi nix develop --command just ci "$CI_BASE" env: CI_BASE: ${{ github.base_ref == 'release' && '--all' || github.event.merge_group.base_sha }} diff --git a/quest/m1/ci-housekeeping.md b/quest/m1/ci-housekeeping.md index ae1ea6c4952..89f66216c9d 100644 --- a/quest/m1/ci-housekeeping.md +++ b/quest/m1/ci-housekeeping.md @@ -1,32 +1,17 @@ -# [XS] Finish CI housekeeping +# [XS] Remove the actionlint queue-key workaround ## Goal -- The merge queue's nextest runs with `NEXTEST_TEST_THREADS=24` after loaded - validation passes. -- `.github/actionlint.yaml` drops its ignore for the `queue` key once an - actionlint release after 1.7.12 is in the dev shell. +`.github/actionlint.yaml` drops its ignore for the `queue` key once an +actionlint release after 1.7.12 is in the dev shell. ## Plan -- **Threads.** Recommended in - [moq-dev/moq#6174](https://github.com/moq-dev/moq/pull/6174): the suite - spends most slots waiting. Run a few loaded `just check --all` passes at - 24 before setting it for the queue job only. A full Rust test selection - with 24 workers pinned to eight CPUs failed - `export::redundant_importers_switch_to_the_survivor_and_back_on_lite_07` - ("stitching export exited") and - `stats::a_late_sink_reads_the_final_stats` - ("the import exited before its input ended"). nextest stopped after - 1,870 of 9,398 tests: 1,868 passed, two failed. Investigate these failures - before enabling the setting; don't mask them with retries or longer - timeouts. [moq-dev/moq#6113](https://github.com/moq-dev/moq/pull/6113) - already edits the redundant-importer tests. -- **Actionlint.** [rhysd/actionlint#661](https://github.com/rhysd/actionlint/pull/661) - is merged but unreleased. The dev shell still has actionlint 1.7.12. - [moq-dev/moq#6180](https://github.com/moq-dev/moq/pull/6180) added the - ignore for the three Pages publishing workflows; remove it when the - release reaches nixpkgs and `just gh check` accepts `queue: max`. +[rhysd/actionlint#661](https://github.com/rhysd/actionlint/pull/661) is merged +but unreleased. The dev shell still has actionlint 1.7.12. +[moq-dev/moq#6180](https://github.com/moq-dev/moq/pull/6180) added the ignore +for the three Pages publishing workflows; remove it when the release reaches +nixpkgs and `just gh check` accepts `queue: max`. Public API: none. Wire: none. diff --git a/rs/moq-cli/tests/integration/stats.rs b/rs/moq-cli/tests/integration/stats.rs index acbd1ae7b5d..a2ef7bdce31 100644 --- a/rs/moq-cli/tests/integration/stats.rs +++ b/rs/moq-cli/tests/integration/stats.rs @@ -344,6 +344,8 @@ async fn a_late_sink_reads_the_final_stats() { let (expected, health) = written(CLIP); let mut import = moq(&relay, "demo", &["import", "--stats", "--max-age", "10s", "ts"]) + // Readiness is an INFO event, independent of the invoking shell's filter. + .env("RUST_LOG", "info") .stdin(Stdio::piped()) .stderr(Stdio::piped()) .spawn()