Skip to content

Commit

Permalink
revert
Browse files Browse the repository at this point in the history
  • Loading branch information
George Hudson committed Nov 15, 2023
1 parent 5569cf7 commit eddc82f
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ workflows:
- main
- master
- /^release.*/
- '2722/circleci' #DELETE BEFORE MERGE
# - '2722/circleci' #DELETE BEFORE MERGE
circle-ci-setup:
jobs:
- setup:
Expand All @@ -84,5 +84,5 @@ workflows:
- main
- master
- /^release.*/
- '2722/circleci' #DELETE BEFORE MERGE
# - '2722/circleci' #DELETE BEFORE MERGE

1 change: 0 additions & 1 deletion .circleci/deployment/jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
- deploy-cloud-dot-gov:
backend-appname: tdp-backend-<< parameters.target_env >>
frontend-appname: tdp-frontend-<< parameters.target_env >>


deploy-staging:
executor: docker-executor
Expand Down
12 changes: 6 additions & 6 deletions .circleci/deployment/workflows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
- equal: [ master, << pipeline.git.branch >> ]
- equal: [ main, << pipeline.git.branch >> ]
- equal: [ develop, << pipeline.git.branch >> ]
- equal: [ '2722/circleci', << pipeline.git.branch >> ] #DELETE BEFORE MERGE
# - equal: [ '2722/circleci', << pipeline.git.branch >> ] #DELETE BEFORE MERGE
- << pipeline.parameters.run_dev_deployment >>
- not: << pipeline.parameters.run_nightly_owasp_scan >>

Expand All @@ -22,15 +22,15 @@
filters:
branches:
ignore:
- '2722/circleci' #DELETE BEFORE MERGE
# - '2722/circleci' #DELETE BEFORE MERGE
- develop
- main
- master
- deploy-infrastructure-staging:
filters:
branches:
only:
- '2722/circleci' #DELETE BEFORE MERGE
# - '2722/circleci' #DELETE BEFORE MERGE
- develop
- main
- deploy-infrastructure-production:
Expand All @@ -57,7 +57,7 @@
filters:
branches:
only:
- '2722/circleci' #DELETE BEFORE MERGE
# - '2722/circleci' #DELETE BEFORE MERGE
- develop
- enable-versioning:
requires:
Expand Down Expand Up @@ -95,7 +95,7 @@
filters:
branches:
ignore:
- '2722/circleci' #DELETE BEFORE MERGE
# - '2722/circleci' #DELETE BEFORE MERGE
- develop
- main
- master
Expand All @@ -105,7 +105,7 @@
filters:
branches:
only:
- '2722/circleci' #DELETE BEFORE MERGE
# - '2722/circleci' #DELETE BEFORE MERGE
- develop
- deploy-staging:
requires:
Expand Down

0 comments on commit eddc82f

Please sign in to comment.