Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into VACMS-10089-nat-outre…
Browse files Browse the repository at this point in the history 
…ach-cal-post-revert
  • Loading branch information
@dsasser
dsasser committed Oct 16, 2023
2 parents d9d1f28 + 8deed1b commit 83c0550
Show file tree
Hide file tree
Showing 4 changed files with 48 additions and 48 deletions.
1 change: 1 addition & 0 deletions .github/pull_request_template.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ As user _uid_ with _user_role_
- [ ] Code Quality Tests have passed.
- [ ] Acceptance Criteria in related issue are met.
- [ ] Manual Code Review Approved.
- [ ] If there are field changes, front end output has been thoroughly checked.

### Select Team for PR review

Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@
"symfony/phpunit-bridge": "^5.1",
"symfony/process": "^4.0",
"symfony/routing": "^4.0",
"va-gov/content-build": "^0.0.3362",
"va-gov/content-build": "^0.0.3365",
"vlucas/phpdotenv": "^5.3",
"webflo/drupal-finder": "^1.0.0",
"webmozart/path-util": "^2.3",
Expand Down
91 changes: 45 additions & 46 deletions composer.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": "8695d165f097a731d99895772c2cbe7c",
"content-hash": "e9adba863abc9a67b2c92b6f2e3788f8",
"packages": [
{
"name": "alchemy/zippy",
Expand Down Expand Up @@ -1271,16 +1271,16 @@
},
{
"name": "datadog/dd-trace",
"version": "0.92.1",
"version": "0.92.2",
"source": {
"type": "git",
"url": "https://github.com/DataDog/dd-trace-php.git",
"reference": "548306ba6879b719afda4037c4a85c2d46bc9f73"
"reference": "d1546b6ea4dded0a23d0640fd91ea5536d6fdaa7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/DataDog/dd-trace-php/zipball/548306ba6879b719afda4037c4a85c2d46bc9f73",
"reference": "548306ba6879b719afda4037c4a85c2d46bc9f73",
"url": "https://api.github.com/repos/DataDog/dd-trace-php/zipball/d1546b6ea4dded0a23d0640fd91ea5536d6fdaa7",
"reference": "d1546b6ea4dded0a23d0640fd91ea5536d6fdaa7",
"shasum": ""
},
"require": {
Expand Down Expand Up @@ -1359,9 +1359,9 @@
],
"support": {
"issues": "https://github.com/DataDog/dd-trace-php/issues",
"source": "https://github.com/DataDog/dd-trace-php/tree/0.92.1"
"source": "https://github.com/DataDog/dd-trace-php/tree/0.92.2"
},
"time": "2023-10-02T09:37:49+00:00"
"time": "2023-10-06T14:25:02+00:00"
},
{
"name": "davedevelopment/stiphle",
Expand Down Expand Up @@ -10119,26 +10119,26 @@
},
{
"name": "drupal/office_hours",
"version": "1.11.0",
"version": "1.12.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/office_hours.git",
"reference": "8.x-1.11"
"reference": "8.x-1.12"
},
"dist": {
"type": "zip",
"url": "https://ftp.drupal.org/files/projects/office_hours-8.x-1.11.zip",
"reference": "8.x-1.11",
"shasum": "5a797e47bc91770ca897aa27767b8614895b1a68"
"url": "https://ftp.drupal.org/files/projects/office_hours-8.x-1.12.zip",
"reference": "8.x-1.12",
"shasum": "e6b88520935adffc0361ab3a80dd44b76b77b9a9"
},
"require": {
"drupal/core": "^8 || ^9 || ^10"
},
"type": "drupal-module",
"extra": {
"drupal": {
"version": "8.x-1.11",
"datestamp": "1686759510",
"version": "8.x-1.12",
"datestamp": "1696706142",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
Expand Down Expand Up @@ -10798,17 +10798,17 @@
},
{
"name": "drupal/pathauto",
"version": "1.11.0",
"version": "1.12.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/pathauto.git",
"reference": "8.x-1.11"
"reference": "8.x-1.12"
},
"dist": {
"type": "zip",
"url": "https://ftp.drupal.org/files/projects/pathauto-8.x-1.11.zip",
"reference": "8.x-1.11",
"shasum": "a006fe9e6046a9833711a1ae56aa4752e65bcdc8"
"url": "https://ftp.drupal.org/files/projects/pathauto-8.x-1.12.zip",
"reference": "8.x-1.12",
"shasum": "b7b6432e315e38e59a7c6cc117134326c580de4c"
},
"require": {
"drupal/core": "^9.3 || ^10",
Expand All @@ -10821,8 +10821,8 @@
"type": "drupal-module",
"extra": {
"drupal": {
"version": "8.x-1.11",
"datestamp": "1660129564",
"version": "8.x-1.12",
"datestamp": "1696776683",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
Expand Down Expand Up @@ -15073,33 +15073,33 @@
},
{
"name": "laminas/laminas-escaper",
"version": "2.12.0",
"version": "2.13.0",
"source": {
"type": "git",
"url": "https://github.com/laminas/laminas-escaper.git",
"reference": "ee7a4c37bf3d0e8c03635d5bddb5bb3184ead490"
"reference": "af459883f4018d0f8a0c69c7a209daef3bf973ba"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laminas/laminas-escaper/zipball/ee7a4c37bf3d0e8c03635d5bddb5bb3184ead490",
"reference": "ee7a4c37bf3d0e8c03635d5bddb5bb3184ead490",
"url": "https://api.github.com/repos/laminas/laminas-escaper/zipball/af459883f4018d0f8a0c69c7a209daef3bf973ba",
"reference": "af459883f4018d0f8a0c69c7a209daef3bf973ba",
"shasum": ""
},
"require": {
"ext-ctype": "*",
"ext-mbstring": "*",
"php": "^7.4 || ~8.0.0 || ~8.1.0 || ~8.2.0"
"php": "~8.1.0 || ~8.2.0 || ~8.3.0"
},
"conflict": {
"zendframework/zend-escaper": "*"
},
"require-dev": {
"infection/infection": "^0.26.6",
"laminas/laminas-coding-standard": "~2.4.0",
"infection/infection": "^0.27.0",
"laminas/laminas-coding-standard": "~2.5.0",
"maglnet/composer-require-checker": "^3.8.0",
"phpunit/phpunit": "^9.5.18",
"psalm/plugin-phpunit": "^0.17.0",
"vimeo/psalm": "^4.22.0"
"phpunit/phpunit": "^9.6.7",
"psalm/plugin-phpunit": "^0.18.4",
"vimeo/psalm": "^5.9"
},
"type": "library",
"autoload": {
Expand Down Expand Up @@ -15131,7 +15131,7 @@
"type": "community_bridge"
}
],
"time": "2022-10-10T10:11:09+00:00"
"time": "2023-10-10T08:35:13+00:00"
},
{
"name": "laminas/laminas-feed",
Expand Down Expand Up @@ -15215,21 +15215,21 @@
},
{
"name": "laminas/laminas-servicemanager",
"version": "3.21.0",
"version": "3.22.0",
"source": {
"type": "git",
"url": "https://github.com/laminas/laminas-servicemanager.git",
"reference": "625f2aa3bc6dd02688b2da5155b3a69870812bda"
"reference": "b4f547078af2ac3173cbe4a64e8fdfbd626c77ae"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laminas/laminas-servicemanager/zipball/625f2aa3bc6dd02688b2da5155b3a69870812bda",
"reference": "625f2aa3bc6dd02688b2da5155b3a69870812bda",
"url": "https://api.github.com/repos/laminas/laminas-servicemanager/zipball/b4f547078af2ac3173cbe4a64e8fdfbd626c77ae",
"reference": "b4f547078af2ac3173cbe4a64e8fdfbd626c77ae",
"shasum": ""
},
"require": {
"laminas/laminas-stdlib": "^3.17",
"php": "~8.1.0 || ~8.2.0",
"php": "~8.1.0 || ~8.2.0 || ~8.3.0",
"psr/container": "^1.0"
},
"conflict": {
Expand All @@ -15250,10 +15250,9 @@
"laminas/laminas-code": "^4.10.0",
"laminas/laminas-coding-standard": "~2.5.0",
"laminas/laminas-container-config-test": "^0.8",
"laminas/laminas-dependency-plugin": "^2.2",
"mikey179/vfsstream": "^1.6.11",
"phpbench/phpbench": "^1.2.9",
"phpunit/phpunit": "^10.0.17",
"phpunit/phpunit": "^10.4",
"psalm/plugin-phpunit": "^0.18.4",
"vimeo/psalm": "^5.8.0"
},
Expand Down Expand Up @@ -15302,7 +15301,7 @@
"type": "community_bridge"
}
],
"time": "2023-05-14T12:24:54+00:00"
"time": "2023-10-10T21:23:36+00:00"
},
{
"name": "laminas/laminas-stdlib",
Expand Down Expand Up @@ -26887,16 +26886,16 @@
},
{
"name": "va-gov/content-build",
"version": "v0.0.3362",
"version": "v0.0.3365",
"source": {
"type": "git",
"url": "https://github.com/department-of-veterans-affairs/content-build.git",
"reference": "349221c0c669dc2e3fb3b22081cd5dd527bb6f8b"
"reference": "3f693d41da6310ae64e1234b6e712e41829e6829"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/349221c0c669dc2e3fb3b22081cd5dd527bb6f8b",
"reference": "349221c0c669dc2e3fb3b22081cd5dd527bb6f8b",
"url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/3f693d41da6310ae64e1234b6e712e41829e6829",
"reference": "3f693d41da6310ae64e1234b6e712e41829e6829",
"shasum": ""
},
"type": "node-project",
Expand All @@ -26923,9 +26922,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.3362"
"source": "https://github.com/department-of-veterans-affairs/content-build/tree/v0.0.3365"
},
"time": "2023-10-10T18:54:10+00:00"
"time": "2023-10-10T19:32:55+00:00"
},
{
"name": "vlucas/phpdotenv",
Expand Down
2 changes: 1 addition & 1 deletion docroot/modules/custom/va_gov_build_trigger/src/Service/BuildRequester.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/
class BuildRequester implements BuildRequesterInterface {

public const VA_GOV_FRONTEND_VERSION = 'va_gov_build_trigger.frontend_version';
public const VA_GOV_FRONTEND_VERSION = 'va_gov_content_release.frontend_version';

/**
* The content release queue entity.
Expand Down

0 comments on commit 83c0550

Please sign in to comment.