From 1ac62807303ed4b2e094b070d0983d3d3be96981 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Jan 2024 20:06:49 -0600 Subject: [PATCH 1/2] Bump va-gov/content-build from 0.0.3412 to 0.0.3413 (#16657) Bumps [va-gov/content-build](https://github.com/department-of-veterans-affairs/content-build) from 0.0.3412 to 0.0.3413. - [Release notes](https://github.com/department-of-veterans-affairs/content-build/releases) - [Commits](https://github.com/department-of-veterans-affairs/content-build/compare/v0.0.3412...v0.0.3413) --- updated-dependencies: - dependency-name: va-gov/content-build dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.json | 2 +- composer.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index 53a8f71a02..57ea691dbd 100644 --- 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 index 4b2d96a764..3cda20e0da 100644 --- 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", From e322087f4c5fdd8b7ef27988df76b1c45216822a Mon Sep 17 00:00:00 2001 From: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> Date: Thu, 4 Jan 2024 04:54:09 -0800 Subject: [PATCH 2/2] VACMS-16642 Remove Drush launcher in preparation for upgrade to drush 12 (#16654) * VACMS-16642: remove drush launcher from tugboat * VACMS-16642: fix drush commands --- .tugboat/config.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.tugboat/config.yml b/.tugboat/config.yml index 6e7a318ed1..c49d129aca 100644 --- 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