Update configuration

City-of-Helsinki · May 20, 2024 · 0b875d0 · 0b875d0
1 parent df19ed9
commit 0b875d0
Show file tree

Hide file tree

Showing 7 changed files with 80 additions and 151 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/field.field.helfi_news_groups.helfi_news_groups.field_frontpage_term_id.yml b/conf/cmi/field.field.helfi_news_groups.helfi_news_groups.field_frontpage_term_id.yml
@@ -4,6 +4,7 @@ status: true
 dependencies:
   config:
     - field.storage.helfi_news_groups.field_frontpage_term_id
+    - external_entities.external_entity_type.helfi_news_groups
   module:
     - external_entities
 _core:

diff --git a/...eld.field.helfi_news_neighbourhoods.helfi_news_neighbourhoods.field_frontpage_term_id.yml b/...eld.field.helfi_news_neighbourhoods.helfi_news_neighbourhoods.field_frontpage_term_id.yml
@@ -4,6 +4,7 @@ status: true
 dependencies:
   config:
     - field.storage.helfi_news_neighbourhoods.field_frontpage_term_id
+    - external_entities.external_entity_type.helfi_news_neighbourhoods
   module:
     - external_entities
 _core:

diff --git a/conf/cmi/field.field.helfi_news_tags.helfi_news_tags.field_frontpage_term_id.yml b/conf/cmi/field.field.helfi_news_tags.helfi_news_tags.field_frontpage_term_id.yml
@@ -4,6 +4,7 @@ status: true
 dependencies:
   config:
     - field.storage.helfi_news_tags.field_frontpage_term_id
+    - external_entities.external_entity_type.helfi_news_tags
   module:
     - external_entities
 _core:

diff --git a/conf/cmi/language/fi/views.view.locked_content.yml b/conf/cmi/language/fi/views.view.locked_content.yml
@@ -50,8 +50,6 @@ display:
             group_items:
               1:
                 title: Julkaistu
-              2:
-                title: Julkaisematon
         type:
           expose:
             label: Sisältötyyppi

diff --git a/conf/cmi/language/sv/views.view.locked_content.yml b/conf/cmi/language/sv/views.view.locked_content.yml
@@ -44,8 +44,6 @@ display:
             group_items:
               1:
                 title: Publicerad
-              2:
-                title: 'Ej publicerad'
         type:
           expose:
             label: Innehållstyp

diff --git a/docker/openshift/entrypoints/20-deploy.sh b/docker/openshift/entrypoints/20-deploy.sh
@@ -1,5 +1,11 @@
 #!/bin/bash
 
+# Skip deployment script if ENV var is true
+if [ "$SKIP_DEPLOY_SCRIPTS" = "true" ]; then
+    echo "SKIP_DEPLOY_SCRIPTS is true. Skipping the steps."
+    return
+fi
+
 source /init.sh
 
 function rollback_deployment {
@@ -36,10 +42,9 @@ if [ "$CURRENT_DEPLOY_ID" != "$OPENSHIFT_BUILD_NAME" ]; then
   # @see https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/blob/main/documentation/deploy-hooks.md
   drush helfi:pre-deploy || true
   # Run maintenance tasks (config import, database updates etc)
-  drush deploy
-
+  OUTPUT=$(sh -c '(drush deploy); exit $?' 2>&1)
   if [ $? -ne 0 ]; then
-    rollback_deployment "drush deploy failed with {$?} exit code. See logs for more information." $CURRENT_DEPLOY_ID
+    rollback_deployment "drush deploy failed with {$?} exit code. ${OUTPUT}" $CURRENT_DEPLOY_ID
     exit 1
   fi
   # Run post-deploy tasks.