Skip to content

Commit

Permalink
Merge branch 'main' into 15345-mobile-feature-removal
Browse files Browse the repository at this point in the history
  • Loading branch information
jilladams authored Jan 30, 2024
2 parents d654708 + 9ec08e8 commit 38c411c
Show file tree
Hide file tree
Showing 18 changed files with 179 additions and 191 deletions.
5 changes: 5 additions & 0 deletions .github/ISSUE_TEMPLATE/taxonomy-update-term.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,5 +75,10 @@ body:
- [ ] Content is reviewed by relevant stakeholders
- [ ] (List any necessary review and approval steps here)
- [ ] Term is published
If term is part of VA Service Taxonomy & the term name changes:
- [ ] Bulk resave system services to pick up name change (filtered for the old name)
- [ ] Bulk Update alias for all system services (filtered for new name)
- [ ] Bulk update facility services (filtered for the old name)
- [ ] Bulk update alias for all facility services (filtered for new name)
validations:
required: true
2 changes: 1 addition & 1 deletion .github/workflows/actions-metrics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
timeout-minutes: 10
steps:
- name: Send GitHub Actions metrics to DataDog
uses: int128/datadog-actions-metrics@12d225bf2f764e5103a994157c1316df39dc3fae # v1.68.0
uses: int128/datadog-actions-metrics@56be1c4bf92adece9d10f7fef4ba48bccf8e8c81 # v1.77.0
with:
datadog-api-key: ${{ secrets.DATADOG_API_KEY }}
collect-job-metrics: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/continuous_integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
uses: ./.github/actions/post-checkout
- name: ReviewDog
# See also `composer va:test:eslint` in composer.json
uses: reviewdog/action-eslint@279acb08336462ec76183a2d9ef1dd43e4c6b391 # v1.21.0
uses: reviewdog/action-eslint@5deb8e2c1d8a9bbefff4d80d6702c41c5b3729cb # v1.22.0
with:
reporter: github-pr-review
eslint_flags: '--max-warnings 0 -c .eslintrc.json --no-eslintrc docroot/modules/custom/**/*.es6.js docroot/themes/custom/**/*.es6.js tests/cypress/**/*.js'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
NODE_TLS_REJECT_UNAUTHORIZED: 0

- name: Cypress run
uses: cypress-io/github-action@ebe8b24c4428922d0f793a5c4c96853a633180e3 # v6.6.0
uses: cypress-io/github-action@1b70233146622b69e789ccdd4f9452adc638d25a # v6.6.1
with:
wait-on: "${{ inputs.preview_url }}"
command: 'npm run test:cypress:parallel'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tugboat-pr-closed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
name: Delete Tugboat Preview
steps:
- name: Restore Preview ID
uses: actions/cache/restore@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3.3.3
uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
with:
path: .tugboat_preview.txt
key: ${{ runner.os }}-tugboat-preview-id-pr-${{ github.event.pull_request.number }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tugboat-pr-opened.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
key: `${{ runner.os }}-tugboat-preview-id-pr-${{ github.event.pull_request.number }}`,
});
- name: Save Preview ID
uses: actions/cache/save@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3.3.3
uses: actions/cache/save@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
with:
path: .tugboat_preview.txt
key: ${{ runner.os }}-tugboat-preview-id-pr-${{ github.event.pull_request.number }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tugboat-pr-updated.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
name: Rebuild Tugboat Preview
steps:
- name: Restore Preview ID
uses: actions/cache/restore@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3.3.3
uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
with:
path: .tugboat_preview.txt
key: ${{ runner.os }}-tugboat-preview-id-pr-${{ github.event.pull_request.number }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tugboat-refresh-cache-responder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
if: ${{ github.event.label.name == 'refresh-tugboat-cache' }}
steps:
- name: Refresh Preview ID
uses: actions/cache/restore@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3.3.3
uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
with:
path: .tugboat_preview.txt
key: ${{ runner.os }}-tugboat-preview-id-pr-${{ github.event.pull_request.number }}
Expand Down
1 change: 1 addition & 0 deletions .tugboat/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@ services:

# Create symlink between vets-website assets and next-build
# - ln -snf "${DOCROOT}/vendor/va-gov/vets-website/build/localhost/generated" "${TUGBOAT_ROOT}/next/public/generated"
- mkdir -p "${TUGBOAT_ROOT}/next/public"
- ln -snf "${TUGBOAT_ROOT}/vets-website/build/localhost/generated" "${TUGBOAT_ROOT}/next/public/generated"


Expand Down
4 changes: 2 additions & 2 deletions .tugboat/vhost-next.conf
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
# Ignore redirecting error doc directory
ProxyPass /.next/ !
# Redirect requests to the running node server from next-build
ProxyPass / http://localhost:3000/
ProxyPassReverse / http://localhost:3000/
ProxyPass / http://localhost:3999/
ProxyPassReverse / http://localhost:3999/

# Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
# error, crit, alert, emerg.
Expand Down
11 changes: 3 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
"drupal/animated_gif": "^2.0",
"drupal/auto_entitylabel": "^3.0",
"drupal/better_exposed_filters": "^6.0",
"drupal/block_content_permissions": "^1.6",
"drupal/cer": "^5.0@beta",
"drupal/change_labels": "dev-3326097-remove-dependency-on-drupal-autoservices#7f92f90b456ac2f394dd434257e39e1d9b3086eb",
"drupal/clientside_validation": "^4.0",
Expand Down Expand Up @@ -98,7 +97,7 @@
"drupal/hierarchy_manager": "^3.0",
"drupal/hms_field": "^2.0",
"drupal/hook_event_dispatcher": "^4.0@beta",
"drupal/ief_table_view_mode": "^2.1",
"drupal/ief_table_view_mode": "^3.0",
"drupal/image_style_warmer": "^1.2@RC",
"drupal/image_widget_crop": "^2.2",
"drupal/jsonapi_extras": "^3.19",
Expand Down Expand Up @@ -222,7 +221,7 @@
"symfony/phpunit-bridge": "^5.1",
"symfony/process": "^6.3",
"symfony/routing": "^6.3",
"va-gov/content-build": "^0.0.3424",
"va-gov/content-build": "^0.0.3430",
"vlucas/phpdotenv": "^5.3",
"webflo/drupal-finder": "^1.0.0",
"webmozart/path-util": "^2.3",
Expand Down Expand Up @@ -447,8 +446,7 @@
},
"drupal/inline_entity_form": {
"3226473 - Opt-in system delete.": "https://www.drupal.org/files/issues/2023-03-28/3226473-opt-in-system-delete-2.patch",
"3061620 - Cancel closes all forms": "https://www.drupal.org/files/issues/2022-07-21/inline_entity_form-close-only-forms-where-close-clicked-3061620-13.patch",
"3311501 - Add label to weight select field for accessibility": "https://www.drupal.org/files/issues/2022-09-23/Adding_labels_to_weight_selects_for_accessibility.patch"
"3061620 - Cancel closes all forms": "https://www.drupal.org/files/issues/2022-07-21/inline_entity_form-close-only-forms-where-close-clicked-3061620-13.patch"
},
"drupal/jsonapi_menu_items": {
"3276561 - Add support for the Menu Item Extras module": "https://www.drupal.org/files/issues/2022-08-01/3276561-05-menu_item_extras_support.patch"
Expand All @@ -459,9 +457,6 @@
"drupal/menu_item_extras": {
"3210468 - The 'bundle' field is not always populated with the menu name": "https://www.drupal.org/files/issues/2021-04-23/3210468.patch"
},
"drupal/message_subscribe": {
"3279287 - PHP 8.1 Deprecated function notices": "https://www.drupal.org/files/issues/2022-11-03/php-81-deprecation-notices.patch"
},
"drupal/migrate_plus": {
"3368310 - Fix str_replace for null values, post PHP 8.1": "patches/3368310-str-replace-throws-php-error-11.patch"
},
Expand Down
Loading

0 comments on commit 38c411c

Please sign in to comment.