From 4c3ff81ecf32d654874e95429094893ad1dbd5b1 Mon Sep 17 00:00:00 2001 From: marky ercillo Date: Mon, 17 Jun 2024 09:02:33 -0700 Subject: [PATCH 1/5] circleCI test --- .circleci/config.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index d1c70d8..48df192 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -201,6 +201,32 @@ workflows: requires: - build + build_and_test_pr_renovate: + jobs: + - setup: + filters: + branches: + only: + - /renovate/.*/ + ignore: + - main + - /version-.*/ + - /pull\/.*/ + tags: + ignore: /.*/ + + - build: + requires: + - setup + + - test: + requires: + - build + + - coverage: + requires: + - build + build_and_test_main: when: equal: ["", << pipeline.parameters.GHA_Action >>] From 4ac318a09fcbf77001a03b0e1e80ab69bbeb3ade Mon Sep 17 00:00:00 2001 From: marky ercillo Date: Tue, 18 Jun 2024 09:31:49 -0700 Subject: [PATCH 2/5] added renovate branch to ignore main --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 48df192..0c06a33 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -152,6 +152,7 @@ workflows: - main - /version-.*/ - /pull\/.*/ + - /renovate/.*/ tags: ignore: /.*/ From 36654df22b80b7724ed89f6732aeae6a2cccfe28 Mon Sep 17 00:00:00 2001 From: marky ercillo Date: Thu, 20 Jun 2024 12:58:02 -0700 Subject: [PATCH 3/5] updated build_and_test_pr --- .circleci/config.yml | 57 +++++++++++++++++++++++++------------------- 1 file changed, 32 insertions(+), 25 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0c06a33..35fcf1c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -151,67 +151,74 @@ workflows: ignore: - main - /version-.*/ - - /pull\/.*/ - - /renovate/.*/ tags: ignore: /.*/ - bazelrc: + filters: + branches: + ignore: /pull\/.*/ context: - BuildTools requires: - setup - build: + name: build-trunk + filters: + branches: + ignore: + - /pull\/.*/ requires: - bazelrc + - build: + name: build-fork + filters: + branches: + only: + - /pull\/.*/ + requires: + - setup + - maybe_release: + filters: + branches: + ignore: + - /pull\/.*/ context: - Publish requires: - - build + - build-trunk - test: - requires: - - build - - - coverage: - requires: - - build - - build_and_test_pr_fork: - jobs: - - setup: + name: test-trunk filters: branches: - only: + ignore: - /pull\/.*/ - tags: - ignore: /.*/ - - - build: requires: - - setup + - build-trunk - test: + name: test-fork + filters: + branches: + only: + - /pull\/.*./ requires: - - build + - build-fork - coverage: requires: - build - build_and_test_pr_renovate: + build_and_test_pr_fork: jobs: - setup: filters: branches: only: - - /renovate/.*/ - ignore: - - main - - /version-.*/ - /pull\/.*/ tags: ignore: /.*/ From d9106cbda6a09e2ff8c2a64bba1e160d48224c16 Mon Sep 17 00:00:00 2001 From: marky ercillo Date: Thu, 20 Jun 2024 13:05:41 -0700 Subject: [PATCH 4/5] updated coverage setup --- .circleci/config.yml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 35fcf1c..0530fe6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -210,8 +210,22 @@ workflows: - build-fork - coverage: + name: coverage-trunk + filters: + branches: + ignore: + - /pull\/.*/ requires: - - build + - build-trunk + + - coverage: + name: coverage-fork + filters: + branches: + only: + - /pull\/.*/ + requires: + - build-fork build_and_test_pr_fork: jobs: From 2153096721e0c9fed8223ff95dbf627224303322 Mon Sep 17 00:00:00 2001 From: marky ercillo Date: Thu, 20 Jun 2024 13:29:39 -0700 Subject: [PATCH 5/5] added renovate branch to forks --- .circleci/config.yml | 35 ++++++++++------------------------- 1 file changed, 10 insertions(+), 25 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0530fe6..b485adc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -157,7 +157,9 @@ workflows: - bazelrc: filters: branches: - ignore: /pull\/.*/ + ignore: + - /pull\/.*/ + - /renovate\/.*/ context: - BuildTools requires: @@ -168,7 +170,8 @@ workflows: filters: branches: ignore: - - /pull\/.*/ + - /pull\/.*/ + - /renovate\/.*/ requires: - bazelrc @@ -178,6 +181,7 @@ workflows: branches: only: - /pull\/.*/ + - /renovate\/.*/ requires: - setup @@ -197,6 +201,7 @@ workflows: branches: ignore: - /pull\/.*/ + - /renovate\/.*/ requires: - build-trunk @@ -206,6 +211,7 @@ workflows: branches: only: - /pull\/.*./ + - /renovate\/.*/ requires: - build-fork @@ -217,38 +223,17 @@ workflows: - /pull\/.*/ requires: - build-trunk - + - coverage: name: coverage-fork filters: branches: only: - /pull\/.*/ + - /renovate\/.*/ requires: - build-fork - build_and_test_pr_fork: - jobs: - - setup: - filters: - branches: - only: - - /pull\/.*/ - tags: - ignore: /.*/ - - - build: - requires: - - setup - - - test: - requires: - - build - - - coverage: - requires: - - build - build_and_test_main: when: equal: ["", << pipeline.parameters.GHA_Action >>]