diff --git a/.cirrus.yml b/.cirrus.yml index ad4670623d..6d81f20090 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -68,7 +68,13 @@ skip_task_on_pr: &SKIP_TASK_ON_PR # Skip this task on PRs if it does not have the CI: Full label, # it continues to run for direct pushes to master/release. skip: > - ! ( $CIRRUS_PR == '' || $CIRRUS_PR_LABELS =~ '.*CI: Full.*' ) + ( ! ($CIRRUS_PR == '' || $CIRRUS_PR_LABELS =~ '.*CI: Full.*') || $CIRRUS_PR_LABELS =~ '.*CI: Skip All' ) + +skip_cluster_test_on_pr: &SKIP_CLUSTER_TEST_ON_PR + # Skip this task on PRs if it does not have the CI: Full label, + # it continues to run for direct pushes to master/release. + skip: > + ( ! ($CIRRUS_PR == '' || $CIRRUS_PR_LABELS =~ '.*CI: (Full|Cluster Test).*') || $CIRRUS_PR_LABELS =~ '.*CI: Skip All' ) zam_skip_task_on_pr: &ZAM_SKIP_TASK_ON_PR # Skip this task on PRs unless it has the "CI: Full" or "CI: ZAM" label @@ -76,7 +82,7 @@ zam_skip_task_on_pr: &ZAM_SKIP_TASK_ON_PR # It continues to run for direct pushes to master/release, as # CIRRUS_PR will be empty. skip: > - ! ( $CIRRUS_PR == '' || $CIRRUS_PR_LABELS =~ '.*CI: (Full|ZAM).*' || changesInclude('src/script_opt/**') ) + ( ! ($CIRRUS_PR == '' || $CIRRUS_PR_LABELS =~ '.*CI: (Full|ZAM).*' || changesInclude('src/script_opt/**')) || $CIRRUS_PR_LABELS =~ '.*CI: Skip All' ) benchmark_only_if_template: &BENCHMARK_ONLY_IF_TEMPLATE # only_if condition for cron-triggered benchmarking tests. @@ -130,6 +136,10 @@ ci_template: &CI_TEMPLATE # Evit some of the cached build artifacts not used in this build. CCACHE_MAXSIZE=${ZEEK_CCACHE_PRUNE_SIZE} ccache -c + # Always skip all tasks on a PR if the "CI: Skip All" label is applied. + skip: > + $CIRRUS_PR != '' && $CIRRUS_PR_LABELS =~ '.*CI: Skip All.*' + env: CIRRUS_WORKING_DIR: /zeek ZEEK_CI_CPUS: *CPUS @@ -526,6 +536,8 @@ windows_task: # Give verbose error output on a test failure. CTEST_OUTPUT_ON_FAILURE: 1 << : *BUILDS_ONLY_IF_TEMPLATE + skip: > + $CIRRUS_PR != '' && $CIRRUS_PR_LABELS =~ '.*CI: Skip All.*' # Container images @@ -612,7 +624,7 @@ amd64_container_image_docker_builder: env: CIRRUS_ARCH: amd64 << : *DOCKER_BUILD_TEMPLATE - << : *SKIP_TASK_ON_PR + << : *SKIP_CLUSTER_TEST_ON_PR container_image_manifest_docker_builder: cpu: 1 @@ -741,7 +753,7 @@ cluster_testing_docker_builder: path: "testing/external/zeek-testing-cluster/.tmp/**" depends_on: - amd64_container_image - << : *SKIP_TASK_ON_PR + << : *SKIP_CLUSTER_TEST_ON_PR # Test zeekctl upon master and release pushes and also when diff --git a/.github/workflows/generate-docs.yml b/.github/workflows/generate-docs.yml index b822ca8f5a..af58b61e3f 100644 --- a/.github/workflows/generate-docs.yml +++ b/.github/workflows/generate-docs.yml @@ -16,7 +16,7 @@ jobs: generate: permissions: contents: write # for Git to git push - if: github.repository == 'zeek/zeek' + if: "github.repository == 'zeek/zeek' && contains(github.event.pull_request.labels.*.name, 'CI: Skip All') == false" runs-on: ubuntu-24.04 steps: diff --git a/CHANGES b/CHANGES index 5d77f17254..bf9a10dff2 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,9 @@ +8.0.0-dev.294 | 2025-05-30 10:29:29 -0700 + + * CI: Add PR label for skipping all CI jobs (Tim Wojtulewicz, Corelight) + + * CI: Add PR label for running cluster tests (Tim Wojtulewicz, Corelight) + 8.0.0-dev.291 | 2025-05-30 08:39:28 -0700 * CI: Add new task to run clang-tidy as part of nightly builds (Tim Wojtulewicz, Corelight) diff --git a/VERSION b/VERSION index 83a4127c4f..a060fb4b1f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -8.0.0-dev.291 +8.0.0-dev.294