Skip to content

Commit

Permalink
Merge branch 'release/0.52.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex Skrypnyk committed Jul 7, 2022
2 parents 4ee4a5f + a6bf3a1 commit a2e3422
Show file tree
Hide file tree
Showing 18 changed files with 679 additions and 191 deletions.
1 change: 1 addition & 0 deletions .ahoy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ commands:
docker-compose exec \
-e DREVOPS_DRUPAL_INSTALL_OPERATIONS_SKIP=${DREVOPS_DRUPAL_INSTALL_OPERATIONS_SKIP:-} \
-e DREVOPS_DRUPAL_INSTALL_OVERRIDE_EXISTING_DB=${DREVOPS_DRUPAL_INSTALL_OVERRIDE_EXISTING_DB:-0} \
-e DREVOPS_DRUPAL_PROFILE=${DREVOPS_DRUPAL_PROFILE:-standard} \
-e SKIP_SUBTHEME_ACTIVATION=${SKIP_SUBTHEME_ACTIVATION:-0} \
-T cli ./scripts/drevops/drupal-install-site.sh
Expand Down
25 changes: 24 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@ aliases:
- &step_process_codebase
run:
name: Process codebase to run in CI

command: |
# Remove lines containing '###' and uncomment comments starting with '##'.
sed -i -e "/###/d" docker-compose.yml && sed -i -e "s/##//" docker-compose.yml
Expand Down Expand Up @@ -215,6 +214,24 @@ jobs:
command: ahoy build
no_output_timeout: 30m

# Standard profile.
build-alt3:
<<: *container_config
parallelism: 1
environment:
SKIP_SUBTHEME_ACTIVATION: 1
DREVOPS_DRUPAL_PROFILE: standard
steps:
- attach_workspace:
at: /workspace
- checkout
- *step_process_codebase
- *step_setup_remote_docker
- run:
name: Build site
command: ahoy build
no_output_timeout: 30m

# Deploy primary branches.
deploy: &job_deploy
<<: *container_config
Expand Down Expand Up @@ -347,11 +364,16 @@ workflows:
filters:
tags:
only: /.*/
- build-alt3:
filters:
tags:
only: /.*/
- deploy:
requires:
- build
- build-alt
- build-alt2
- build-alt3
filters:
branches:
# Allowed branches:
Expand All @@ -368,6 +390,7 @@ workflows:
- build
- build-alt
- build-alt2
- build-alt3
filters:
branches:
ignore: /.*/
Expand Down
Loading

0 comments on commit a2e3422

Please sign in to comment.