From 4468741d8a2c909aa465847013c8c95d38eb892c Mon Sep 17 00:00:00 2001 From: Jennifer Shehane Date: Mon, 4 Nov 2024 10:48:59 -0500 Subject: [PATCH 1/5] Update workflows path --- .circleci/config.yml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5639d07f7022..af3c996e8e99 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -53,16 +53,8 @@ jobs: echo "Skipping CI; branch in progress - $TRIGGER_INSTRUCTIONS" cancel_build - - run: - name: Download .circleci/workflows.yaml - command: | - if [[ "$CIRCLE_BRANCH" == "pull/"* ]]; then - curl -o workflows.yml https://raw.githubusercontent.com/${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}/develop/.circleci/workflows.yml - else - curl -o workflows.yml https://raw.githubusercontent.com/${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}/${CIRCLE_BRANCH}/.circleci/workflows.yml - fi - continuation/continue: - configuration_path: workflows.yml + configuration_path: .circleci/workflows.yml workflows: # the setup-workflow workflow is always triggered. From b2cef4e134a9bfe88e692010926100cc85e7d481 Mon Sep 17 00:00:00 2001 From: Jennifer Shehane Date: Mon, 4 Nov 2024 11:14:40 -0500 Subject: [PATCH 2/5] bump and try checkout --- .circleci/config.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index af3c996e8e99..9a3f7ef9cd25 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2.1 setup: true orbs: - continuation: circleci/continuation@0.3.1 + continuation: circleci/continuation@1.0.0 jobs: verify-ci-should-run: @@ -55,6 +55,9 @@ jobs: - continuation/continue: configuration_path: .circleci/workflows.yml + parameters: | + { "targetBranch" : "$GITHUB_PR_BASE_BRANCH" } + checkout: true workflows: # the setup-workflow workflow is always triggered. From 88157a7625150ab83b483fe0c9959f1a3c657e10 Mon Sep 17 00:00:00 2001 From: Jennifer Shehane Date: Mon, 4 Nov 2024 13:11:14 -0500 Subject: [PATCH 3/5] add checkout --- .circleci/config.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9a3f7ef9cd25..33b19fbb0cd8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -52,12 +52,11 @@ jobs: echo "Skipping CI; branch in progress - $TRIGGER_INSTRUCTIONS" cancel_build - + - checkout - continuation/continue: configuration_path: .circleci/workflows.yml parameters: | { "targetBranch" : "$GITHUB_PR_BASE_BRANCH" } - checkout: true workflows: # the setup-workflow workflow is always triggered. From 8c0365c9c76dfc8894aaa55eed8b2881cd98783c Mon Sep 17 00:00:00 2001 From: Jennifer Shehane Date: Mon, 4 Nov 2024 13:15:43 -0500 Subject: [PATCH 4/5] remove params --- .circleci/config.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 33b19fbb0cd8..0d0268833e6f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -55,8 +55,6 @@ jobs: - checkout - continuation/continue: configuration_path: .circleci/workflows.yml - parameters: | - { "targetBranch" : "$GITHUB_PR_BASE_BRANCH" } workflows: # the setup-workflow workflow is always triggered. From f1c3744ebcda82bd499458579b6f5ec3236a68fa Mon Sep 17 00:00:00 2001 From: Jennifer Shehane Date: Mon, 4 Nov 2024 13:40:50 -0500 Subject: [PATCH 5/5] empty commit