Merge branch 'main' into VACMS-16418-homepage-manager-block-permissions

department-of-veterans-affairs · Jan 4, 2024 · ce2fae2 · ce2fae2
2 parents acd2c1d + e322087
commit ce2fae2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 16 deletions.
diff --git a/.tugboat/config.yml b/.tugboat/config.yml
@@ -111,10 +111,6 @@ services:
         - echo "${OAUTH_PUBLIC_KEY}" >> ${TUGBOAT_ROOT}/public.key
         - echo "${OAUTH_PRIVATE_KEY}" >> ${TUGBOAT_ROOT}/private.key
 
-        # Install drush-launcher, if desired.
-        - wget -O /usr/local/bin/drush https://github.com/drush-ops/drush-launcher/releases/download/0.6.0/drush.phar
-        - chmod +x /usr/local/bin/drush
-
         # Link the document root to the expected path. This example links /docroot
         # to the docroot.
         - ln -snf "${TUGBOAT_ROOT}/docroot" "${DOCROOT}"
@@ -214,14 +210,14 @@ services:
 
 
         # https://www.drush.org/latest/deploycommand/ (updatedb, cache:rebuild, config:import, deploy:hook)
-        - drush deploy
+        - bash -lc 'drush deploy'
 
         # Disable sitewide alerts so as not to interfere with testing.
-        - drush sitewide-alert:disable
+        - bash -lc 'drush sitewide-alert:disable'
 
         # Prevent continuous releases from running on Tugboat, and reset to ready.
-        - drush sset va_gov_build_trigger.continuous_release_enabled 0
-        - drush sset va_gov_build_trigger.release_state ready
+        - bash -lc 'drush sset va_gov_build_trigger.continuous_release_enabled 0'
+        - bash -lc 'drush sset va_gov_build_trigger.release_state ready'
 
         # Setup background processing service.  This uses runit to keep process up
         # See https://docs.tugboat.qa/setting-up-services/how-to-set-up-services/running-a-background-process

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.3412",
+        "va-gov/content-build": "^0.0.3413",
         "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": "86b64711dabe170d98620dd29d6984e3",
+    "content-hash": "5a7e58688f1c33c8227dff112b75d798",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -25700,16 +25700,16 @@
         },
         {
             "name": "va-gov/content-build",
-            "version": "v0.0.3412",
+            "version": "v0.0.3413",
             "source": {
                 "type": "git",
                 "url": "https://github.com/department-of-veterans-affairs/content-build.git",
-                "reference": "e2938debc1e4e57305cd23d87ba31b32c399fbe1"
+                "reference": "f8ffbe21c76c0c687fe558ec7985aa8a0e37e477"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/e2938debc1e4e57305cd23d87ba31b32c399fbe1",
-                "reference": "e2938debc1e4e57305cd23d87ba31b32c399fbe1",
+                "url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/f8ffbe21c76c0c687fe558ec7985aa8a0e37e477",
+                "reference": "f8ffbe21c76c0c687fe558ec7985aa8a0e37e477",
                 "shasum": ""
             },
             "type": "node-project",
@@ -25736,9 +25736,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.3412"
+                "source": "https://github.com/department-of-veterans-affairs/content-build/tree/v0.0.3413"
             },
-            "time": "2024-01-02T19:30:09+00:00"
+            "time": "2024-01-03T16:08:07+00:00"
         },
         {
             "name": "vlucas/phpdotenv",