Merge branch 'main' into VACMS-6434-vets-website-content-release-inte…

…gration
department-of-veterans-affairs · Nov 6, 2023 · 5a94222 · 5a94222
2 parents 3c0e445 + 8d470e8
commit 5a94222
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/composer.json b/composer.json
@@ -207,7 +207,7 @@
         "symfony/phpunit-bridge": "^5.1",
         "symfony/process": "^4.0",
         "symfony/routing": "^4.0",
-        "va-gov/content-build": "^0.0.3378",
+        "va-gov/content-build": "^0.0.3380",
         "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": "6e4c15c31d64e3479e8c7bef49129d53",
+    "content-hash": "ef9631d803a8b5674de8dfae702d59e1",
     "packages": [
         {
             "name": "alchemy/zippy",
@@ -26915,16 +26915,16 @@
         },
         {
             "name": "va-gov/content-build",
-            "version": "v0.0.3378",
+            "version": "v0.0.3380",
             "source": {
                 "type": "git",
                 "url": "https://github.com/department-of-veterans-affairs/content-build.git",
-                "reference": "51b6a6dafdb360cd2c7a02e4a7aa14453d40e9ae"
+                "reference": "eaaec0f3f67e5fe9371c2a16aeba8351875d1e22"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/51b6a6dafdb360cd2c7a02e4a7aa14453d40e9ae",
-                "reference": "51b6a6dafdb360cd2c7a02e4a7aa14453d40e9ae",
+                "url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/eaaec0f3f67e5fe9371c2a16aeba8351875d1e22",
+                "reference": "eaaec0f3f67e5fe9371c2a16aeba8351875d1e22",
                 "shasum": ""
             },
             "type": "node-project",
@@ -26951,9 +26951,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.3378"
+                "source": "https://github.com/department-of-veterans-affairs/content-build/tree/v0.0.3380"
             },
-            "time": "2023-10-30T17:47:27+00:00"
+            "time": "2023-11-03T19:33:01+00:00"
         },
         {
             "name": "vlucas/phpdotenv",

diff --git a/tests/scripts/content-build-gql.sh b/tests/scripts/content-build-gql.sh
@@ -13,6 +13,11 @@ set -ex
 repo_root="$(git rev-parse --show-toplevel)"
 pushd "${repo_root}" > /dev/null
 
+export NVM_DIR="$HOME/.nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"
+source ~/.bashrc
+
 composer va:web:prepare-dotenv
 
 touch ./.buildlock
@@ -35,6 +40,7 @@ popd
 pushd "${web_path}"
 export INSTALL_HOOKS=no
 export NODE_ENV=production
+nvm use
 yarn build \
   --pull-drupal \
   --gql-queries-only \