Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rerun edge build #131

Open
wants to merge 12 commits into
base: development
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 3 additions & 30 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,39 +12,12 @@ default_docker_image: &docker_image

workflows:
version: 2
build-test:
jobs:
- build
- coding_standards:
requires:
- build
- deprecated_code:
requires:
- build
build-edge:
triggers:
- schedule:
# At 03:00 every Mon-Fri
cron: "0 3 * * 1-5"
filters:
branches:
only:
- development
jobs:
- build_edge

# A separate scheduled workflow to sync the data after the edge build completes.
build-edge-finalise:
triggers:
- schedule:
# At 03:30 on every day-of-week from Monday through Friday
cron: "30 3 * * 1-5"
filters:
branches:
only:
- edge
jobs:
- sync_data
- sync_data:
requires:
- build_edge

jobs:
# Tests the integrity of the build, stores the results in a workspace for re-use in later jobs.
Expand Down
1 change: 0 additions & 1 deletion .lando.base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ env_file:
- .env
services:
appserver:
scanner: false
xdebug: debug
build_as_root:
- /app/.lando/scripts/appserver_build.sh
Expand Down
2 changes: 1 addition & 1 deletion .platform.app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ build:
flavor: composer
hooks:
build: "set -e\necho \"Update robots.txt with Corp Lite customisations\"\ncp -f web/robots_custom.txt web/robots.txt\n"
post_deploy: "set -e\n\n# Save the Fastly service value and overwrite with a dummy one in order to break\n# the connection to Fastly, otherwise any cache clear of any site will purge the\n# entire Fastly cache - we don't want this to happen as we'd like Fastly to continue\n# serving the sites to anonymous users during a release.\necho \"***** Breaking connection to Fastly ******\"\ntemp=$FASTLY_API_SERVICE\nexport FASTLY_API_SERVICE=dummyservice\n\n# For each multi site - run db-updates and import config.\nfor site in nisra afbini hseni etini northsouthministerialcouncil\ndo\n result=$(drush -l $site st | grep \"Drupal bootstrap : Successful\" | awk {'print $4'})\n if [ \"$result\" = \"Successful\" ]; then\n echo \"****** $site deployment ******\"\n cd /app/web/sites/$site\n # Disable Fastly logging\n #drush -l $site disable-fastly-logging\n # Readonlymode module should be installed on all sites,\n # but we'll just make sure.\n drush en readonlymode -l $site -y\n # Set site to readonly just in case editors are logged on.\n drush -l $site cset readonlymode.settings enabled 1 -y\n drush -l $site -y cache-rebuild\n drush -l $site -y updatedb\n drush -l $site -y config-import\n drush -l $site import-all-if-installed safe\n if [ \"$PLATFORM_ENVIRONMENT_TYPE\" = production ]; then\n # Disable QA logons\n drush -l $site bulk_update_qa_accounts disable\n else\n # Enable QA logons\n drush -l $site bulk_update_qa_accounts enable\n fi\n # Turn off readonly mode.\n #drush -l $site cset readonlymode.settings enabled 0 -y\n else\n echo \"****** Skipping $site as there is no database ******\"\n echo \"\"\n fi\ndone\n\n# Reconnect to Fastly\necho \"***** Reinstate connection to Fastly ******\"\nexport FASTLY_API_SERVICE=$temp\n\n# For each multi site - clear cache (including Fastly cache)\nfor site in nisra afbini hseni etini northsouthministerialcouncil\ndo\n result=$(drush -l $site st | grep \"Drupal bootstrap : Successful\" | awk {'print $4'})\n if [ \"$result\" = \"Successful\" ]; then\n echo \"****** $site cache clear ******\"\n cd /app/web/sites/$site\n drush -l $site -y cache-rebuild\n # Enable Fastly logging\n drush -l $site enable-fastly-logging\n fi\ndone\n"
post_deploy: "set -e\n\n# Save the Fastly service value and overwrite with a dummy one in order to break\n# the connection to Fastly, otherwise any cache clear of any site will purge the\n# entire Fastly cache - we don't want this to happen as we'd like Fastly to continue\n# serving the sites to anonymous users during a release.\necho \"***** Breaking connection to Fastly ******\"\ntemp=$FASTLY_API_SERVICE\nexport FASTLY_API_SERVICE=dummyservice\n\n# For each multi site - run db-updates and import config.\nfor site in nisra afbini hseni etini northsouthministerialcouncil\ndo\n result=$(drush -l $site st | grep \"Drupal bootstrap : Successful\" | awk {'print $4'})\n if [ \"$result\" = \"Successful\" ]; then\n echo \"****** $site deployment ******\"\n cd /app/web/sites/$site\n # Readonlymode module should be installed on all sites,\n # but we'll just make sure.\n drush en readonlymode -l $site -y\n # Set site to readonly just in case editors are logged on.\n drush -l $site cset readonlymode.settings enabled 1 -y\n drush -l $site -y cache-rebuild\n drush -l $site -y updatedb\n drush -l $site -y config-import\n # Import blocks and taxonomies\n drush -l $site import-blocks --choice=safe\n drush -l $site import-taxonomies --choice=safe\n if [ \"$PLATFORM_ENVIRONMENT_TYPE\" = production ]; then\n # Disable QA logons\n drush -l $site bulk_update_qa_accounts disable\n else\n # Enable QA logons\n drush -l $site bulk_update_qa_accounts enable\n fi\n # Turn off readonly mode.\n #drush -l $site cset readonlymode.settings enabled 0 -y\n else\n echo \"****** Skipping $site as there is no database ******\"\n echo \"\"\n fi\ndone\n\n# Reconnect to Fastly\necho \"***** Reinstate connection to Fastly ******\"\nexport FASTLY_API_SERVICE=$temp\n\n# For each multi site - clear cache (including Fastly cache)\nfor site in nisra afbini hseni etini northsouthministerialcouncil\ndo\n result=$(drush -l $site st | grep \"Drupal bootstrap : Successful\" | awk {'print $4'})\n if [ \"$result\" = \"Successful\" ]; then\n echo \"****** $site cache clear ******\"\n cd /app/web/sites/$site\n drush -l $site -y cache-rebuild\n fi\ndone\n"
web:
locations:
/:
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
},
"require-dev": {
"dof-dss/maestro-hosting": "^1.0",
"dof-dss/maestro-shell": "^1.0",
"dof-dss/maestro-shell": "^10.1",
"drupal/coder": "^8.3",
"drupal/config_override_warn": "^1.4",
"drupal/core-dev": "^10.1",
Expand Down
60 changes: 30 additions & 30 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion project/config/afbini/config/core.extension.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ module:
cookie_content_blocker: 0
corplite_eu_cookie_compliance: 0
corplite_image_styles: 0
corplite_migrations: 0
csp: 0
ctools: 0
date_facet_drilldown: 0
Expand Down