Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

VACMS-14683: service location migration with sleep #18028

Closed
wants to merge 26 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
e5c82ea
VACMS-14704: Adding service location fields (#15599)
omahane Oct 10, 2023
c0a7278
VACMS-15649: Removes free text fields from service location (#15676)
omahane Oct 13, 2023
bbd2c89
VACMS-16348: Add fields to service location (#17017)
omahane Jan 25, 2024
8d8b80c
VACMS-16451: Audit view service location (#17054)
omahane Jan 29, 2024
7850849
VACMS-15559 Migration of service location data to paragraphs (#16911)
swirtSJW Feb 3, 2024
2e9c325
VACMS-16348: Service location ux enhancements (#17048)
omahane Feb 3, 2024
52a0133
VACMS-17142: Update service content types post-Service Location migra…
Becapa Feb 15, 2024
52826f9
VACMS-17241 Update service location migration script to keep state. (…
swirtSJW Feb 15, 2024
49f84d8
VACMS-17114: Service location fields lighthouse push (#17213)
omahane Feb 28, 2024
8364114
VACMS-17114: adding null coalesce and main rebase (#17496)
omahane Mar 13, 2024
a773336
Bump drupal/hook_event_dispatcher from 4.0.0-rc1 to 4.0.0 (#17428)
dependabot[bot] Mar 11, 2024
405997e
Revert hook event dispatcher update (#17484)
edmund-dunn Mar 11, 2024
81a0f24
VACMS-17516 and 17518: Migrating certain Service location values to n…
omahane Apr 3, 2024
d8186dd
Bump symfony/console from 6.4.4 to 6.4.6 (#17728)
dependabot[bot] Apr 5, 2024
d993653
Bump symfony/routing from 6.4.5 to 6.4.6 (#17726)
dependabot[bot] Apr 5, 2024
15e8aed
VACMS-17516: main rebase of integration-service-location (#17901)
omahane Apr 19, 2024
c27c4a1
VACMS-17843: change visit options virtual support (#17905)
omahane Apr 26, 2024
9d4f695
VACMS-17956: Add virtual support to VAMC health services push to Ligh…
omahane May 1, 2024
ce978de
VACMS-17516 and 17518: Migrating certain Service location values to n…
omahane Apr 3, 2024
16d2630
Bump symfony/console from 6.4.4 to 6.4.6 (#17728)
dependabot[bot] Apr 5, 2024
140b214
Bump symfony/routing from 6.4.5 to 6.4.6 (#17726)
dependabot[bot] Apr 5, 2024
10c967c
VACMS-14683: Updates composer.json
omahane May 1, 2024
e4e77a8
VACMS-14683: Updates composer.lock, removing extra twig-bridge
omahane May 1, 2024
c06b99f
VACMS-14683: Adds sleep after 1000
omahane May 2, 2024
5616f3c
VACMS-14683: Adds check for 1st run
omahane May 2, 2024
5914634
VACMS-14683: Moves sleep function to make it function.
omahane May 2, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/actions-metrics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@ jobs:
timeout-minutes: 10
steps:
- name: Send GitHub Actions metrics to DataDog
<<<<<<< HEAD
uses: int128/datadog-actions-metrics@519686d5aeec89083d24b723724656e65fc0b7e4 # v1.87.0
=======
uses: int128/datadog-actions-metrics@8a70221aaf8d488c817ae230ac6354ee59279080 # v1.81.0
>>>>>>> 7e44cfb46 (VACMS-17956: Add virtual support to VAMC health services push to Lighthouse (#17978))
with:
datadog-api-key: ${{ secrets.DATADOG_API_KEY }}
collect-job-metrics: true
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/contextual-advice.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,11 @@ jobs:
# branch or its commits, regardless of provenance.
#
# Do not execute any code located within the repository!
<<<<<<< HEAD
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
=======
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
>>>>>>> 7e44cfb46 (VACMS-17956: Add virtual support to VAMC health services push to Lighthouse (#17978))
with:
fetch-depth: 0
ref: ${{ github.event.pull_request.head.sha }}
Expand Down
36 changes: 36 additions & 0 deletions .github/workflows/continuous_integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
<<<<<<< HEAD
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
=======
uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
>>>>>>> 7e44cfb46 (VACMS-17956: Add virtual support to VAMC health services push to Lighthouse (#17978))
- name: Check Corresponding Entity Reference Fields
# See also `composer va:test:check-cer` in composer.json
run: ./tests/scripts/check-cer.sh
Expand All @@ -28,7 +32,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
<<<<<<< HEAD
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
=======
uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
>>>>>>> 7e44cfb46 (VACMS-17956: Add virtual support to VAMC health services push to Lighthouse (#17978))
- name: Composer Validate
run: composer validate

Expand All @@ -38,7 +46,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
<<<<<<< HEAD
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
=======
uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
>>>>>>> 7e44cfb46 (VACMS-17956: Add virtual support to VAMC health services push to Lighthouse (#17978))
- name: Post-Checkout Actions
uses: ./.github/actions/post-checkout
- name: ReviewDog
Expand All @@ -55,7 +67,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
<<<<<<< HEAD
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
=======
uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
>>>>>>> 7e44cfb46 (VACMS-17956: Add virtual support to VAMC health services push to Lighthouse (#17978))
- name: Post-Checkout Actions
uses: ./.github/actions/post-checkout
- name: Run PHP_CodeSniffer and ReviewDog
Expand All @@ -79,7 +95,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
<<<<<<< HEAD
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
=======
uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
>>>>>>> 7e44cfb46 (VACMS-17956: Add virtual support to VAMC health services push to Lighthouse (#17978))
- name: Post-Checkout Actions
uses: ./.github/actions/post-checkout
- name: Run PHPLint
Expand All @@ -92,7 +112,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
<<<<<<< HEAD
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
=======
uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
>>>>>>> 7e44cfb46 (VACMS-17956: Add virtual support to VAMC health services push to Lighthouse (#17978))
- name: Post-Checkout Actions
uses: ./.github/actions/post-checkout
- name: Run PHPStan and ReviewDog
Expand All @@ -119,7 +143,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
<<<<<<< HEAD
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
=======
uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
>>>>>>> 7e44cfb46 (VACMS-17956: Add virtual support to VAMC health services push to Lighthouse (#17978))
- name: Post-Checkout Actions
uses: ./.github/actions/post-checkout
- name: Run PHPUnit (Unit Tests only)
Expand All @@ -136,7 +164,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
<<<<<<< HEAD
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
=======
uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
>>>>>>> 7e44cfb46 (VACMS-17956: Add virtual support to VAMC health services push to Lighthouse (#17978))
- name: Stylelint modules
# See also `composer va:test:stylelint-modules` in composer.json
uses: reviewdog/action-stylelint@24fcb957ec2ca41649b8e060a6630feb0d8e4201 # v1.23.0
Expand Down Expand Up @@ -164,7 +196,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
<<<<<<< HEAD
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
=======
uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
>>>>>>> 7e44cfb46 (VACMS-17956: Add virtual support to VAMC health services push to Lighthouse (#17978))
with:
fetch-depth: 0
- name: Delete any existing comment.
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,11 @@ jobs:
steps:

- name: Checkout
<<<<<<< HEAD
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
=======
uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
>>>>>>> 7e44cfb46 (VACMS-17956: Add virtual support to VAMC health services push to Lighthouse (#17978))
with:
# When Sorry-Cypress support is enabled on `main`, this should be
# removed so that the `main` version of the workflow is used
Expand Down
12 changes: 12 additions & 0 deletions .github/workflows/default-branch-datadog-metrics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
<<<<<<< HEAD
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
=======
uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
>>>>>>> 7e44cfb46 (VACMS-17956: Add virtual support to VAMC health services push to Lighthouse (#17978))
- uses: ./.github/actions/post-checkout
- name: Find occurrences of "Implements hook" in *.module files.
id: hook_implementations
Expand Down Expand Up @@ -75,7 +79,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
<<<<<<< HEAD
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
=======
uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
>>>>>>> 7e44cfb46 (VACMS-17956: Add virtual support to VAMC health services push to Lighthouse (#17978))
- uses: ./.github/actions/post-checkout
- name: Run PHPUnit (Unit Tests only)
run: bin/phpunit \
Expand Down Expand Up @@ -197,7 +205,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
<<<<<<< HEAD
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
=======
uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
>>>>>>> 7e44cfb46 (VACMS-17956: Add virtual support to VAMC health services push to Lighthouse (#17978))
- uses: ./.github/actions/post-checkout
- name: Run PHPLOC and parse output for metrics.
id: phploc_code_quality
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/dependabot-auto-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,11 @@ jobs:

# Checkout repo to make package allow list available
- name: Checkout
<<<<<<< HEAD
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
=======
uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
>>>>>>> 7e44cfb46 (VACMS-17956: Add virtual support to VAMC health services push to Lighthouse (#17978))

# Use a YAML formatted config file to list which dependencies can be auto-merged
- name: Read list of Allowed Auto-merge Dependencies
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/pull-request-labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
<<<<<<< HEAD
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
=======
uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
>>>>>>> 7e44cfb46 (VACMS-17956: Add virtual support to VAMC health services push to Lighthouse (#17978))
with:
token: "${{ secrets.GITHUB_TOKEN }}"
- name: Autolabel
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/set-tugboat-tests-pending.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
<<<<<<< HEAD
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
=======
uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
>>>>>>> 7e44cfb46 (VACMS-17956: Add virtual support to VAMC health services push to Lighthouse (#17978))
- name: Set status for Tugboat tasks.
run: |
test_names=(
Expand Down
45 changes: 26 additions & 19 deletions composer.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4745,10 +4745,6 @@
"GPL-2.0-or-later"
],
"authors": [
{
"name": "drupalspoons",
"homepage": "https://www.drupal.org/user/3647684"
},
{
"name": "moshe weitzman",
"homepage": "https://www.drupal.org/user/23"
Expand Down Expand Up @@ -4882,6 +4878,10 @@
"homepage": "https://www.drupal.org/u/realityloop",
"role": "Maintainer"
},
{
"name": "Junyor",
"homepage": "https://www.drupal.org/user/7006"
},
{
"name": "lhangea",
"homepage": "https://www.drupal.org/user/2743803"
Expand Down Expand Up @@ -5597,17 +5597,17 @@
},
{
"name": "drupal/entity_clone",
"version": "2.0.0-beta6",
"version": "2.0.0-beta4",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/entity_clone.git",
"reference": "2.0.0-beta6"
"reference": "2.0.0-beta4"
},
"dist": {
"type": "zip",
"url": "https://ftp.drupal.org/files/projects/entity_clone-2.0.0-beta6.zip",
"reference": "2.0.0-beta6",
"shasum": "afd98c1aeffc1d28b8a0b29c8cfb09de95debc9b"
"url": "https://ftp.drupal.org/files/projects/entity_clone-2.0.0-beta4.zip",
"reference": "2.0.0-beta4",
"shasum": "21b6636cea194e1f71753a54b28d4a56b42a4b00"
},
"require": {
"drupal/core": "^8.8 || ^9 || ^10"
Expand All @@ -5621,8 +5621,8 @@
"type": "drupal-module",
"extra": {
"drupal": {
"version": "2.0.0-beta6",
"datestamp": "1712549899",
"version": "2.0.0-beta4",
"datestamp": "1687250852",
"security-coverage": {
"status": "not-covered",
"message": "Beta releases are not covered by Drupal security advisories."
Expand Down Expand Up @@ -11033,6 +11033,14 @@
"name": "Deciphered",
"homepage": "https://www.drupal.org/user/103796"
},
{
"name": "greggles",
"homepage": "https://www.drupal.org/user/36762"
},
{
"name": "kgatzby",
"homepage": "https://www.drupal.org/user/3601554"
},
{
"name": "michaellander",
"homepage": "https://www.drupal.org/user/636494"
Expand Down Expand Up @@ -11397,7 +11405,7 @@
"extra": {
"drupal": {
"version": "8.x-1.12",
"datestamp": "1696776683",
"datestamp": "1712319355",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
Expand Down Expand Up @@ -18895,16 +18903,16 @@
},
{
"name": "phpstan/phpdoc-parser",
"version": "1.28.0",
"version": "1.26.0",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpdoc-parser.git",
"reference": "cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb"
"reference": "231e3186624c03d7e7c890ec662b81e6b0405227"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb",
"reference": "cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb",
"url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/231e3186624c03d7e7c890ec662b81e6b0405227",
"reference": "231e3186624c03d7e7c890ec662b81e6b0405227",
"shasum": ""
},
"require": {
Expand Down Expand Up @@ -18936,9 +18944,9 @@
"description": "PHPDoc parser with support for nullable, intersection and generic types",
"support": {
"issues": "https://github.com/phpstan/phpdoc-parser/issues",
"source": "https://github.com/phpstan/phpdoc-parser/tree/1.28.0"
"source": "https://github.com/phpstan/phpdoc-parser/tree/1.26.0"
},
"time": "2024-04-03T18:51:33+00:00"
"time": "2024-02-23T16:05:55+00:00"
},
{
"name": "phpstan/phpstan",
Expand Down Expand Up @@ -26924,7 +26932,6 @@
"drupal/no_table_drag": 15,
"drupal/openapi": 5,
"drupal/openapi_ui": 5,
"drupal/paragraphs_features": 10,
"drupal/password_strength": 20,
"drupal/pathologic": 15,
"drupal/prometheus_exporter": 10,
Expand Down
Loading