From a42c2e2976654b00145f1024f2d5d01026fcc306 Mon Sep 17 00:00:00 2001 From: Ryan Hughes Date: Fri, 11 Sep 2026 00:31:55 -0400 Subject: [PATCH] Make package validation independent of concurrency and release drift --- bin/sync-upstream | 2 ++ pkgbuilds/flea/PKGBUILD | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/bin/sync-upstream b/bin/sync-upstream index 148cd13..3853499 100755 --- a/bin/sync-upstream +++ b/bin/sync-upstream @@ -757,6 +757,8 @@ EOF mkdir -p "$one_root" cp -a "$BUILD_ROOT/pkgbuilds/1password" "$one_root/1password" one_dir="$one_root/1password" + # Keep the fixture older than its mocked release as the real recipe advances. + sed -i -e 's/^pkgver=.*/pkgver=8.12.34/' -e 's/^pkgrel=.*/pkgrel=36/' "$one_dir/PKGBUILD" debian_fetch_packages() { printf 'Package: 1password\nVersion: %s\n' "$one_version" } diff --git a/pkgbuilds/flea/PKGBUILD b/pkgbuilds/flea/PKGBUILD index 768b670..07fe1d7 100644 --- a/pkgbuilds/flea/PKGBUILD +++ b/pkgbuilds/flea/PKGBUILD @@ -71,6 +71,8 @@ check() { --proc /proc --dev /dev --tmpfs /tmp /usr/bin/true >/dev/null 2>&1; then printf 'Skipping sandbox integration tests: this builder cannot create an unprivileged namespace\n' test_args+=( + --skip backend::archiveops::tests::a_silent_failure_names_the_operation_that_was_running + --skip tui::job::tests::preview_worker_reads_held_source_in_readonly_sandbox --skip backend::archiveops::tests::a_tool_that_exits_zero_writing_nothing_is_caught_by_the_predicate --skip backend::archiveops::tests::an_empty_archive_extracts_to_an_empty_directory_and_that_is_success --skip backend::archiveops::tests::only_the_archive_root_extracts_to_nothing_while_nested_directories_do_not @@ -92,7 +94,8 @@ check() { ) fi - cargo test --frozen --release -- "${test_args[@]}" + # Recovery-lock tests are unreliable when run concurrently with other suites. + cargo test --frozen --release -- --test-threads=1 "${test_args[@]}" ./tests/js.sh ./tests/keymap-gen.sh }