From c928a478f295eac334f2d279772710b1c535069a Mon Sep 17 00:00:00 2001 From: actions-bot Date: Tue, 10 Oct 2023 07:20:07 +0000 Subject: [PATCH] Update configuration --- composer.lock | 38 +++++++++---------- ...view_display.tpr_unit.tpr_unit.default.yml | 20 ++++++++-- docker-compose.yml | 16 +++++--- phpunit.xml.dist | 22 ++++++----- public/sites/default/settings.php | 19 ++++++++-- 5 files changed, 76 insertions(+), 39 deletions(-) diff --git a/composer.lock b/composer.lock index 3d74f6854..606f1c577 100644 --- a/composer.lock +++ b/composer.lock @@ -3751,16 +3751,16 @@ }, { "name": "drupal/hdbt", - "version": "5.6.14", + "version": "5.6.16", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "34d158f86599a2c4f8264e16bd9eb27f8fdc7aad" + "reference": "c04c52069efd9befb75f3bdac754a52a88ab5f0f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/34d158f86599a2c4f8264e16bd9eb27f8fdc7aad", - "reference": "34d158f86599a2c4f8264e16bd9eb27f8fdc7aad", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/c04c52069efd9befb75f3bdac754a52a88ab5f0f", + "reference": "c04c52069efd9befb75f3bdac754a52a88ab5f0f", "shasum": "" }, "require": { @@ -3778,10 +3778,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.6.14", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.6.16", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2023-10-05T12:52:11+00:00" + "time": "2023-10-10T07:16:09+00:00" }, { "name": "drupal/hdbt_admin", @@ -4011,16 +4011,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "3.4.23", + "version": "3.4.24", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "3f82733f535cfb08cf497315dd3e58e93f5635e9" + "reference": "e0bb476200b068015d2d64595a11ee85307d536c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/3f82733f535cfb08cf497315dd3e58e93f5635e9", - "reference": "3f82733f535cfb08cf497315dd3e58e93f5635e9", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/e0bb476200b068015d2d64595a11ee85307d536c", + "reference": "e0bb476200b068015d2d64595a11ee85307d536c", "shasum": "" }, "require": { @@ -4124,10 +4124,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.4.23", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.4.24", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2023-10-09T10:03:46+00:00" + "time": "2023-10-10T06:52:38+00:00" }, { "name": "drupal/helfi_proxy", @@ -4598,17 +4598,17 @@ }, { "name": "drupal/linkit", - "version": "6.0.1", + "version": "6.0.2", "source": { "type": "git", "url": "https://git.drupalcode.org/project/linkit.git", - "reference": "6.0.1" + "reference": "6.0.2" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/linkit-6.0.1.zip", - "reference": "6.0.1", - "shasum": "c990a0fab63cb65d46dcf312aa0363f65e31ee68" + "url": "https://ftp.drupal.org/files/projects/linkit-6.0.2.zip", + "reference": "6.0.2", + "shasum": "b7d965d122403c0d1cd8b891db3ea56004026804" }, "require": { "drupal/core": "^9.4 || ^10.0.0" @@ -4623,8 +4623,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "6.0.1", - "datestamp": "1696099905", + "version": "6.0.2", + "datestamp": "1696865395", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml index 85126e435..ffd3f8c30 100644 --- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml +++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml @@ -18,7 +18,7 @@ dependencies: - telephone - text _core: - default_config_hash: gN3l4zK06RMpcSsvWP2mzlDDk2Rik_T-jtUHAHx07RM + default_config_hash: wdJwarmtiJ0vb01WKk2D0Ze8oSHKTf0ni1WKSnYpfvE id: tpr_unit.tpr_unit.default targetEntityType: tpr_unit bundle: tpr_unit @@ -128,6 +128,22 @@ content: third_party_settings: { } weight: 23 region: content + latitude: + type: string + label: hidden + settings: + link_to_entity: false + third_party_settings: { } + weight: 24 + region: content + longitude: + type: string + label: hidden + settings: + link_to_entity: false + third_party_settings: { } + weight: 23 + region: content name: type: string label: hidden @@ -228,9 +244,7 @@ hidden: field_unit_type: true hide_description: true langcode: true - latitude: true links: true - longitude: true other_info: true price_info: true search_api_excerpt: true diff --git a/docker-compose.yml b/docker-compose.yml index 821ef00ba..c7dc6ba8b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -24,7 +24,7 @@ services: # DOCKERHOST: host.docker.internal # Use drush server to run functional tests, so we don't have to care about # permission or SSL issues. - SIMPLETEST_BASE_URL: "http://127.0.0.1:8888" + SIMPLETEST_BASE_URL: "http://app:8888" SIMPLETEST_DB: "mysql://drupal:drupal@db:3306/drupal" BROWSERTEST_OUTPUT_BASE_URL: "https://${DRUPAL_HOSTNAME}" DRUPAL_VARNISH_HOST: "${COMPOSE_PROJECT_NAME}-varnish" @@ -120,16 +120,22 @@ services: artemis: container_name: "${COMPOSE_PROJECT_NAME}-artemis" image: quay.io/artemiscloud/activemq-artemis-broker - ports: - - "8161:8161" - - "61616:61616" - - "5672:5672" environment: AMQ_EXTRA_ARGS: "--nio --user admin --password admin" + depends_on: + - app networks: - internal profiles: - queue + chromium: + # @todo Update this to newer version once minkphp supports Selenium 4. + # @see https://github.com/minkphp/MinkSelenium2Driver/pull/372 + image: selenium/standalone-chrome:106.0 + networks: + - internal + profiles: + - testing networks: internal: external: false diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 0ae082a9a..b4434b3cd 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,10 +1,14 @@ @@ -12,11 +16,11 @@ - - + + - - + + diff --git a/public/sites/default/settings.php b/public/sites/default/settings.php index 2fbf96611..e402d926d 100755 --- a/public/sites/default/settings.php +++ b/public/sites/default/settings.php @@ -94,6 +94,10 @@ function drupal_get_env(string|array $variables) : mixed { } $routes[] = 'http://127.0.0.1'; +if ($simpletest_base_url = getenv('SIMPLETEST_BASE_URL')) { + $routes[] = $simpletest_base_url; +} + if ($drush_options_uri = getenv('DRUSH_OPTIONS_URI')) { $routes[] = $drush_options_uri; } @@ -127,8 +131,14 @@ function drupal_get_env(string|array $variables) : mixed { 'driver' => 'helfi_azure', 'config' => [ 'name' => $blob_storage_name, - 'key' => getenv('AZURE_BLOB_STORAGE_KEY'), - 'token' => getenv('AZURE_BLOB_STORAGE_SAS_TOKEN'), + 'key' => drupal_get_env([ + 'AZURE_BLOB_STORAGE_KEY', + 'BLOBSTORAGE_ACCOUNT_KEY', + ]), + 'token' => drupal_get_env([ + 'AZURE_BLOB_STORAGE_SAS_TOKEN', + 'BLOBSTORAGE_SAS_TOKEN', + ]), 'container' => getenv('AZURE_BLOB_STORAGE_CONTAINER'), 'endpointSuffix' => 'core.windows.net', 'protocol' => 'https', @@ -230,7 +240,10 @@ function drupal_get_env(string|array $variables) : mixed { $config['helfi_proxy.settings']['robots_header_enabled'] = (bool) $robots_header_enabled; } -$artemis_destination = drupal_get_env(['ARTEMIS_DESTINATION', 'NON_EXISTENT_TEST']); +$artemis_destination = drupal_get_env([ + 'ARTEMIS_DESTINATION', + 'PROJECT_NAME', +]); if ($artemis_brokers = getenv('ARTEMIS_BROKERS') && $artemis_destination) { $settings['stomp']['default'] = [