Merge pull request #835 from City-of-Helsinki/UHF-9088_workflows

UHF-9088: Workflow update
City-of-Helsinki · Mar 25, 2024 · ee0353a · ee0353a
2 parents 935bdc9 + 055dc1b
commit ee0353a
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 7 deletions.
diff --git a/.github/workflows/update-config.yml b/.github/workflows/update-config.yml
@@ -37,7 +37,19 @@ jobs:
           $(drush sql:connect) < latest.sql
           drush cim -y && drush updb -y && drush cr
           composer update drupal/helfi_* drupal/hdbt* -W --no-interaction
-          drush cr && drush updb -y && drush cex -y
+          drush cr
+
+          # Update translations from localize.drupal.org and helfi-modules
+          # before running update hooks to reduce clutter in configuration files.
+          drush locale:check && drush locale:update
+          drush updb -y
+
+          # Update translations from helfi_platform_config. These translations
+          # consists of overrides for non customised translations and will
+          # override current translation with a non customised translation.
+          drush helfi:locale-import helfi_platform_config
+          drush cex -y
+
           # Update platform
           drush helfi:tools:update-platform
 

diff --git a/tools/make/project/install.mk b/tools/make/project/install.mk
@@ -1,9 +1,9 @@
 ifeq ($(DRUPAL_CONF_EXISTS),yes)
-	DRUPAL_NEW_TARGETS := up build drush-si drush-cr drush-locale-update drush-uli
+	DRUPAL_NEW_TARGETS := up build drush-si drush-cr drush-locale-update drush-helfi-locale-import drush-uli
 else
-	DRUPAL_NEW_TARGETS := up build drush-si helfi-drush-enable-modules drush-locale-update drush-uli
+	DRUPAL_NEW_TARGETS := up build drush-si drush-helfi-enable-modules drush-locale-update drush-helfi-locale-import drush-uli
 endif
-DRUPAL_POST_INSTALL_TARGETS := drush-deploy drush-locale-update drush-uli
+DRUPAL_POST_INSTALL_TARGETS := drush-locale-update drush-deploy drush-helfi-locale-import drush-uli
 
 OC_LOGIN_TOKEN ?= $(shell bash -c 'read -s -p "You must obtain an API token by visiting https://oauth-openshift.apps.arodevtest.hel.fi/oauth/token/request (Token):" token; echo $$token')
 
@@ -26,8 +26,8 @@ oc-sync:
 	$(call drush,cim -y)
 	$(call drush,cr)
 
-PHONY += helfi-drush-enable-modules
-helfi-drush-enable-modules: ## Enable modules and base configurations.
+PHONY += drush-helfi-enable-modules
+drush-helfi-enable-modules: ## Enable modules and base configurations.
 	$(call step,Install base configurations...)
 	$(call drush,cr)
 	$(call drush,en -y helfi_platform_config helfi_platform_config_base)
@@ -39,5 +39,9 @@ drush-locale-update: ## Update translations.
 	$(call drush,locale:check)
 	$(call drush,locale:update)
 	$(call drush,cr)
-	$(call step,Import custom translations...)
+
+PHONY += drush-helfi-locale-import
+drush-helfi-locale-import:  ## Update translations from helfi platform config.
+	$(call step,Import helfi platform config translations...)
 	$(call drush,helfi:locale-import helfi_platform_config)
+	$(call drush,cr)