From eda1b8aec9012c3dc2eb41bb40658ba82225fba5 Mon Sep 17 00:00:00 2001 From: ludamad Date: Sun, 23 Jul 2023 10:37:53 -0400 Subject: [PATCH] ci: cleanup branch filtering --- .circleci/config.yml | 187 +++++++++++++++++++++---------------------- 1 file changed, 90 insertions(+), 97 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 80d4d8c24cb4..f0f6c84a098e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -895,95 +895,88 @@ jobs: deploy_dockerhub aztec-sandbox # Repeatable config for defining the workflow below. -tag_regex: &tag_regex /^v.*/ -job_defaults: &job_defaults - filters: - tags: - only: *tag_regex - context: - - build - - slack - post-steps: - - slack/notify: - event: fail - branch_pattern: "master" -deploy_defaults: &deploy_defaults - filters: - branches: - only: - - master - - stage - tags: - only: *tag_regex - context: - - build - - slack - post-steps: - - slack/notify: - event: fail - branch_pattern: "master" -yarn_project_defaults: &yarn_project_defaults - requires: - - yarn-project-base - <<: *job_defaults - filters: - tags: - only: *tag_regex - branches: - ignore: - - /^barretenberg\/.*/ - - /^circuits\/.*/ -e2e_test_defaults: &e2e_test_defaults - requires: - - e2e-join - <<: *job_defaults - filters: - tags: - only: *tag_regex - branches: - ignore: - - /^barretenberg\/.*/ - - /^circuits\/.*/ -circuits_defaults: &circuits_defaults - filters: - tags: - only: *tag_regex - branches: - ignore: - - /^barretenberg\/.*/ - context: - - build - - slack - post-steps: - - slack/notify: - event: fail - branch_pattern: "master" -bb_defaults: &bb_defaults - filters: - tags: - only: *tag_regex - branches: - ignore: - - /^circuits\/.*/ - context: - - build - - slack - post-steps: - - slack/notify: - event: fail - branch_pattern: "master" -bb_test_defaults: &bb_test_defaults - requires: - - barretenberg-x86_64-linux-clang-assert - <<: *bb_defaults -circuits-wasm-test_defaults: &circuits-wasm-test_defaults - requires: - - circuits-wasm-linux-clang-assert - <<: *circuits_defaults -circuits-x86_64-test_defaults: &circuits-x86_64-test_defaults - requires: - - circuits-x86_64-linux-clang-assert - <<: *circuits_defaults +job_defaults: + tag_regex: &tag_regex /^v.*/ + aztec_job_defaults: &aztec_job_defaults + filters: + tags: + only: *tag_regex + # ignore 'team' branches + # the jobs meant to run on these branches should use a different default base + branches: + ignore: + - /^barretenberg\/.*/ + - /^circuits\/.*/ + context: + - build + - slack + post-steps: + - slack/notify: + event: fail + branch_pattern: "master" + deploy_defaults: &deploy_defaults + filters: + branches: + only: + - master + - stage + tags: + only: *tag_regex + context: + - build + - slack + post-steps: + - slack/notify: + event: fail + branch_pattern: "master" + yarn_project_defaults: &yarn_project_defaults + requires: + - yarn-project-base + <<: *aztec_job_defaults + e2e_test_defaults: &e2e_test_defaults + requires: + - e2e-join + <<: *aztec_job_defaults + circuits_defaults: &circuits_defaults + filters: + tags: + only: *tag_regex + branches: + ignore: + - /^barretenberg\/.*/ + context: + - build + - slack + post-steps: + - slack/notify: + event: fail + branch_pattern: "master" + bb_defaults: &bb_defaults + filters: + tags: + only: *tag_regex + branches: + ignore: + - /^circuits\/.*/ + context: + - build + - slack + post-steps: + - slack/notify: + event: fail + branch_pattern: "master" + bb_test_defaults: &bb_test_defaults + requires: + - barretenberg-x86_64-linux-clang-assert + <<: *bb_defaults + circuits-wasm-test_defaults: &circuits-wasm-test_defaults + requires: + - circuits-wasm-linux-clang-assert + <<: *circuits_defaults + circuits-x86_64-test_defaults: &circuits-x86_64-test_defaults + requires: + - circuits-x86_64-linux-clang-assert + <<: *circuits_defaults workflows: system: when: @@ -1013,20 +1006,20 @@ workflows: branches: only: - master - <<: *job_defaults + <<: *aztec_job_defaults - bb-js: requires: - barretenberg-wasm-linux-clang - <<: *job_defaults + <<: *aztec_job_defaults - bb-js-tests: requires: - bb-js - <<: *job_defaults + <<: *aztec_job_defaults - barretenberg-acir-tests: requires: - barretenberg-x86_64-linux-clang-assert - bb-js - <<: *job_defaults + <<: *aztec_job_defaults - circuits-wasm-linux-clang: *circuits_defaults - circuits-wasm-linux-clang-assert: *circuits_defaults - circuits-x86_64-linux-clang-tidy: *circuits_defaults @@ -1048,13 +1041,13 @@ workflows: - circuits-x86_64-tests <<: *circuits_defaults - - l1-contracts: *job_defaults + - l1-contracts: *aztec_job_defaults - yarn-project-base: requires: - circuits-wasm-linux-clang - l1-contracts - <<: *job_defaults + <<: *aztec_job_defaults - aztec-js: *yarn_project_defaults - end-to-end: *yarn_project_defaults @@ -1102,7 +1095,7 @@ workflows: - types - circuits-js - rollup-provider - <<: *job_defaults + <<: *aztec_job_defaults - e2e-deploy-contract: *e2e_test_defaults - e2e-zk-token-contract: *e2e_test_defaults @@ -1135,7 +1128,7 @@ workflows: - integration-l1-publisher - integration-archiver-l1-to-l2 - e2e-p2p - <<: *job_defaults + <<: *aztec_job_defaults - deploy-dockerhub: requires: