diff --git a/.circleci/config.yml b/.circleci/config.yml index 55a05f29c..aa816acd3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -308,7 +308,9 @@ parameters: workflows: primary: when: - not: << pipeline.parameters.is-nightly-run >> + and: + - not: << pipeline.parameters.is-nightly-run >> + - not: << pipeline.parameters.is-triggered-e2e-test >> jobs: - lint - test @@ -317,8 +319,8 @@ workflows: filters: branches: only: /develop|release\/sprint-[\.\d]+|main/ - - deploy-job: # Deploy job with requires dependencies which may not always run - name: deploy-job-conditional + - deploy-job: # All dependencies must pass before deploying + name: deploy-with-all-dependent-jobs-required requires: - lint - test @@ -328,8 +330,12 @@ workflows: branches: only: - develop - - deploy-job: # Deploy job with no requires dependencies which will always run - name: deploy-job-always + - deploy-job: # Deploy job even when e2e tests fail + name: deploy-even-if-e2e-job-fails + requires: + - lint + - test + - dependency-check filters: branches: only: /release\/sprint-[\.\d]+|main/ diff --git a/front-end/.snyk b/front-end/.snyk index 3876251d5..6bff1531b 100644 --- a/front-end/.snyk +++ b/front-end/.snyk @@ -2,9 +2,16 @@ version: v1.22.1 # ignores vulnerabilities until expiry date; change duration by modifying expiry date ignore: - SNYK-JS-NGXBOOTSTRAP-174319: + 'SNYK-JS-BOOTSTRAP-7444580': - '*': - reason: None Given - expires: 2022-03-19T21:41:00.684Z - created: 2022-02-17T21:41:00.692Z + reason: 'No upgrade or patch available' + expires: 2024-11-01T21:41:00.684Z + 'SNYK-JS-BOOTSTRAP-7444593': + - '*': + reason: 'No upgrade or patch available' + expires: 2024-11-01T21:41:00.684Z + 'SNYK-JS-BOOTSTRAP-7444617': + - '*': + reason: 'No upgrade or patch available' + expires: 2024-11-01T21:41:00.684Z patch: {}