From d8999ed4f6a8ad1ba3f2149e0859bc3fc1916b3e Mon Sep 17 00:00:00 2001 From: George Hudson Date: Tue, 31 Oct 2023 09:37:25 -0600 Subject: [PATCH] repaired logic for workflow --- .circleci/deployment/workflows.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.circleci/deployment/workflows.yml b/.circleci/deployment/workflows.yml index 982a7a01a..533ccbaad 100644 --- a/.circleci/deployment/workflows.yml +++ b/.circleci/deployment/workflows.yml @@ -1,12 +1,13 @@ #workflows: deployment: when: - or: - - equal: [ master, << pipeline.git.branch >> ] - - equal: [ main, << pipeline.git.branch >> ] - - equal: [ develop, << pipeline.git.branch >> ] - - << pipeline.parameters.run_dev_deployment >> - unless: << pipeline.parameters.run_nightly_owasp_scan >> + and: + - or: + - equal: [ master, << pipeline.git.branch >> ] + - equal: [ main, << pipeline.git.branch >> ] + - equal: [ develop, << pipeline.git.branch >> ] + - << pipeline.parameters.run_dev_deployment >> + - not: << pipeline.parameters.run_nightly_owasp_scan >> jobs: - deploy-project-updates-site: @@ -126,4 +127,3 @@ only: - develop - master - \ No newline at end of file