From e44f7e3225e290c5805f8bcd52a2a6175ff79fed Mon Sep 17 00:00:00 2001 From: Chris Green Date: Wed, 2 Aug 2023 14:05:01 -0700 Subject: [PATCH 1/4] Update drush_config_distro_update.php --- web/private/scripts/drush_config_distro_update.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/web/private/scripts/drush_config_distro_update.php b/web/private/scripts/drush_config_distro_update.php index 69d5de8..778a2e2 100644 --- a/web/private/scripts/drush_config_distro_update.php +++ b/web/private/scripts/drush_config_distro_update.php @@ -2,8 +2,11 @@ // Ensure update mode is 'merge' and run config-distro-update. echo "Running Config Distro update...\n"; -passthru('drush -n -y state:set config_sync.update_mode 1 --input-format=integer'); -passthru('drush -n -y config-distro-update'); +passthru('drush -n -y config-distro-update --update-mode=1'); +echo "Config Distro update complete.\n"; + +echo "Syncing permissions...\n"; +passthru('drush -n -y az-core-config-add-permissions'); echo "Config Distro update complete.\n"; // Rebuild the cache. From e6166ae8be7e3377be1b4ebe4ef193f4fb80905f Mon Sep 17 00:00:00 2001 From: Chris Green Date: Thu, 24 Aug 2023 16:41:08 -0700 Subject: [PATCH 2/4] Update web/private/scripts/drush_config_distro_update.php Co-authored-by: Joe Parsons <471936+joeparsons@users.noreply.github.com> --- web/private/scripts/drush_config_distro_update.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/private/scripts/drush_config_distro_update.php b/web/private/scripts/drush_config_distro_update.php index 778a2e2..0b2bbbc 100644 --- a/web/private/scripts/drush_config_distro_update.php +++ b/web/private/scripts/drush_config_distro_update.php @@ -7,7 +7,7 @@ echo "Syncing permissions...\n"; passthru('drush -n -y az-core-config-add-permissions'); -echo "Config Distro update complete.\n"; +echo "Permissions sync complete.\n"; // Rebuild the cache. echo "Clearing cache.\n"; From e9bec508a3fbc76ca4bde6ea5612ef8bc8489671 Mon Sep 17 00:00:00 2001 From: Chris Green Date: Thu, 24 Aug 2023 17:00:06 -0700 Subject: [PATCH 3/4] Move sync permissions to new step --- settings-examples/pantheon.example.yml | 8 ++++++++ .../scripts/drush_az_quickstart_sync_permissions.php | 6 ++++++ 2 files changed, 14 insertions(+) create mode 100644 web/private/scripts/drush_az_quickstart_sync_permissions.php diff --git a/settings-examples/pantheon.example.yml b/settings-examples/pantheon.example.yml index 75c6fbe..9a5eb67 100644 --- a/settings-examples/pantheon.example.yml +++ b/settings-examples/pantheon.example.yml @@ -18,9 +18,17 @@ workflows: - type: webphp description: Run Config Distro Update with Drush script: private/scripts/drush_config_distro_update.php + # Sync permissions after running Config Distro Update. + - type: webphp + description: Sync Permissions with Drush + script: private/scripts/drush_az_quickstart_sync_permissions.php sync_code: after: # Run Config Distro update when pushing/syncing code into dev/multidev. - type: webphp description: Run Config Distro Update with Drush script: private/scripts/drush_config_distro_update.php + # Sync permissions after running Config Distro Update. + - type: webphp + description: Sync Permissions with Drush + script: private/scripts/drush_az_quickstart_sync_permissions.php diff --git a/web/private/scripts/drush_az_quickstart_sync_permissions.php b/web/private/scripts/drush_az_quickstart_sync_permissions.php new file mode 100644 index 0000000..93d6da9 --- /dev/null +++ b/web/private/scripts/drush_az_quickstart_sync_permissions.php @@ -0,0 +1,6 @@ + Date: Thu, 24 Aug 2023 17:01:29 -0700 Subject: [PATCH 4/4] Remove sync permissions from cd-update script --- web/private/scripts/drush_config_distro_update.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/web/private/scripts/drush_config_distro_update.php b/web/private/scripts/drush_config_distro_update.php index 0b2bbbc..0ceabfb 100644 --- a/web/private/scripts/drush_config_distro_update.php +++ b/web/private/scripts/drush_config_distro_update.php @@ -5,10 +5,6 @@ passthru('drush -n -y config-distro-update --update-mode=1'); echo "Config Distro update complete.\n"; -echo "Syncing permissions...\n"; -passthru('drush -n -y az-core-config-add-permissions'); -echo "Permissions sync complete.\n"; - // Rebuild the cache. echo "Clearing cache.\n"; passthru('drush cr');