Merge branch 'main' into dependabot/composer/mglaman/phpstan-drupal-1…

….2.7
department-of-veterans-affairs · Feb 20, 2024 · 5799c94 · 5799c94
2 parents c939685 + bb9c404
commit 5799c94
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 15 deletions.
diff --git a/composer.json b/composer.json
@@ -221,7 +221,7 @@
         "symfony/phpunit-bridge": "^5.1",
         "symfony/process": "^6.3",
         "symfony/routing": "^6.3",
-        "va-gov/content-build": "^0.0.3441",
+        "va-gov/content-build": "^0.0.3443",
         "vlucas/phpdotenv": "^5.3",
         "webflo/drupal-finder": "^1.0.0",
         "webmozart/path-util": "^2.3",

diff --git a/composer.lock b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "0aafdc84754d748d9a73e8856c353b95",
+    "content-hash": "531e4e20bcfc5dbf7198d4d544d7e286",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -10282,26 +10282,26 @@
         },
         {
             "name": "drupal/office_hours",
-            "version": "1.12.0",
+            "version": "1.16.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/office_hours.git",
-                "reference": "8.x-1.12"
+                "reference": "8.x-1.16"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/office_hours-8.x-1.12.zip",
-                "reference": "8.x-1.12",
-                "shasum": "e6b88520935adffc0361ab3a80dd44b76b77b9a9"
+                "url": "https://ftp.drupal.org/files/projects/office_hours-8.x-1.16.zip",
+                "reference": "8.x-1.16",
+                "shasum": "63b2efd112cde04f3b2b2823a7ade0f3a3c73bf4"
             },
             "require": {
                 "drupal/core": "^8 || ^9 || ^10"
             },
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-1.12",
-                    "datestamp": "1696706142",
+                    "version": "8.x-1.16",
+                    "datestamp": "1708099237",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -25807,16 +25807,16 @@
         },
         {
             "name": "va-gov/content-build",
-            "version": "v0.0.3441",
+            "version": "v0.0.3443",
             "source": {
                 "type": "git",
                 "url": "https://github.com/department-of-veterans-affairs/content-build.git",
-                "reference": "4ff558516c6af0270ce577b42127f5cd413ddf8f"
+                "reference": "988b6e091aa1bf53e8ddf29a2e9f80615b3bc3be"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/4ff558516c6af0270ce577b42127f5cd413ddf8f",
-                "reference": "4ff558516c6af0270ce577b42127f5cd413ddf8f",
+                "url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/988b6e091aa1bf53e8ddf29a2e9f80615b3bc3be",
+                "reference": "988b6e091aa1bf53e8ddf29a2e9f80615b3bc3be",
                 "shasum": ""
             },
             "type": "node-project",
@@ -25843,9 +25843,9 @@
             "description": "Front-end for VA.gov. This repository contains the code that generates the www.va.gov website. It contains a Metalsmith static site builder that uses a Drupal CMS for content. This file is here to publish releases to https://packagist.org/packages/va-gov/content-build, so that the CMS CI system can install it and update it using standard composer processes, and so that we can run tests across both systems. See https://github.com/department-of-veterans-affairs/va.gov-cms for the CMS repo, and stand by for more documentation.",
             "support": {
                 "issues": "https://github.com/department-of-veterans-affairs/content-build/issues",
-                "source": "https://github.com/department-of-veterans-affairs/content-build/tree/v0.0.3441"
+                "source": "https://github.com/department-of-veterans-affairs/content-build/tree/v0.0.3443"
             },
-            "time": "2024-02-14T14:09:01+00:00"
+            "time": "2024-02-19T13:44:21+00:00"
         },
         {
             "name": "vlucas/phpdotenv",

diff --git a/docroot/sites/default/settings/settings.brd_common.php b/docroot/sites/default/settings/settings.brd_common.php
@@ -16,3 +16,7 @@
 }
 
 $settings['cms_datadog_api_key'] = getenv('CMS_DATADOG_API_KEY');
+
+// Update next-build site endpoint to the appropriate preview alias
+$config['next.next_site.next_build_preview_server']['base_url'] = getenv('NEXT_BUILD_PREVIEW_HOSTNAME');
+$config['next.next_site.next_build_preview_server']['preview_url'] = getenv('NEXT_BUILD_PREVIEW_HOSTNAME') . 'api/preview';