Merge changes from develop.

dpc-sdp · Apr 17, 2024 · d44fafa · d44fafa
2 parents a903eb5 + acd2219
commit d44fafa
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 16 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,12 +1,14 @@
 name: build
 
-on: push
+on:
+  push:
+  workflow_dispatch:
 
 jobs:
   set_status_in_progress:
     name: set_status_in_progress
     if: always()
-    uses: dpc-sdp/github-actions/.github/workflows/set_status.yml@main
+    uses: dpc-sdp/github-actions/.github/workflows/set_status.yml@v1.2.0
     secrets: inherit
     with:
       context: 'tide_build'
@@ -16,19 +18,19 @@ jobs:
   tide_build:
     name: tide_build
     secrets: inherit
-    uses: dpc-sdp/github-actions/.github/workflows/tide_build.yml@main
+    uses: dpc-sdp/github-actions/.github/workflows/tide_build.yml@v1.2.0
     with:
       module_build: true
       runner: biggy-tide
   export_config:
     name: export_config
     secrets: inherit
-    uses: dpc-sdp/github-actions/.github/workflows/export_config.yml@main
+    uses: dpc-sdp/github-actions/.github/workflows/export_config.yml@v1.2.0
   set_status:
     name: set_status
     needs: [tide_build]
     if: always()
-    uses: dpc-sdp/github-actions/.github/workflows/set_status.yml@main
+    uses: dpc-sdp/github-actions/.github/workflows/set_status.yml@v1.2.0
     secrets: inherit
     with:
       context: 'tide_build'

diff --git a/.github/workflows/dorg_git_sync.yml b/.github/workflows/dorg_git_sync.yml
@@ -10,5 +10,5 @@ on:
 jobs:
   dorg_git_sync:
     name: dorg_git_sync
-    uses: dpc-sdp/github-actions/.github/workflows/dorg_git_sync.yml@main
+    uses: dpc-sdp/github-actions/.github/workflows/dorg_git_sync.yml@v1.2.0
     secrets: inherit
diff --git a/.github/workflows/merge_to_reference.yml b/.github/workflows/merge_to_reference.yml
@@ -9,7 +9,7 @@ jobs:
   set_status_in_progress:
     name: set_status_in_progress
     if: always()
-    uses: dpc-sdp/github-actions/.github/workflows/set_status.yml@main
+    uses: dpc-sdp/github-actions/.github/workflows/set_status.yml@v1.2.0
     secrets: inherit
     with:
       context: 'tide_merge_to_reference'
@@ -18,12 +18,12 @@ jobs:
       target_url: ${{ github.event.repository.html_url }}/actions/runs/${{ github.run_id }}
   tide_merge_to_reference:
     name: tide_merge_to_reference
-    uses: dpc-sdp/github-actions/.github/workflows/tide_merge_to_reference.yml@main
+    uses: dpc-sdp/github-actions/.github/workflows/tide_merge_to_reference.yml@v1.2.0
   set_status:
     name: set_status
     needs: [tide_merge_to_reference]
     if: always()
-    uses: dpc-sdp/github-actions/.github/workflows/set_status.yml@main
+    uses: dpc-sdp/github-actions/.github/workflows/set_status.yml@v1.2.0
     secrets: inherit
     with:
       context: 'tide_merge_to_reference'

diff --git a/composer.json b/composer.json
@@ -15,17 +15,16 @@
         "Fix PHP 8.2+ deprecation notices - https://www.drupal.org/project/content_lock/issues/3343964#comment-15061454": "https://www.drupal.org/files/issues/2023-05-22/3343964-5.patch"
       },
       "drupal/core": {
-        "Add a 'machine_name' widget for string field types with a UniqueField constraint - https://www.drupal.org/project/drupal/issues/2685749": "https://www.drupal.org/files/issues/2022-02-14/2685749-106.patch",
-        "Add filter by input field to Menu UI - https://www.drupal.org/project/drupal/issues/3170906#comment-15165852": "https://www.drupal.org/files/issues/2023-07-27/3170906-menu-filter-8.patch",
+        "Add a 'machine_name' widget for string field types with a UniqueField constraint - https://www.drupal.org/project/drupal/issues/2685749#comment-15361693": "https://www.drupal.org/files/issues/2023-12-15/machine-name-widget-2685749-130.patch",
+        "Add filter by input field to Menu UI - https://www.drupal.org/project/drupal/issues/3170906#comment-15553421": "https://www.drupal.org/files/issues/2024-04-16/3170906-menu-filter-12.patch",
         "Autocomplete widget in node sidebar causes overflow-https://www.drupal.org/project/drupal/issues/3268619#comment-14955369": "https://www.drupal.org/files/issues/2023-03-07/3268619_autocomplete_overflow_5.patch",
         "DateTimeComputed tries to compute from an empty value - https://www.drupal.org/project/drupal/issues/3052608#comment-14666671": "https://www.drupal.org/files/issues/2022-08-25/DateTimeComputed-tries-to-compute-from-an-empty-value-3052608-16.patch",
         "Empty breadcrumb at node/add and node/add/{content_type} when frontpage view is enabled - https://www.drupal.org/project/drupal/issues/3220437": "https://www.drupal.org/files/issues/2021-08-25/3220437-61.patch",
         "Form Required Class Missing from Claro - https://www.drupal.org/project/drupal/issues/3160987#comment-14609681": "https://www.drupal.org/files/issues/2022-07-17/3160987-10.patch",
-        "Make the DateTime input format and descriptive text consistent - https://www.drupal.org/project/drupal/issues/2791693#comment-15126668": "https://www.drupal.org/files/issues/2023-06-28/2791693-91.patch",
         "ModuleHandler skips all hook implementations when invoked before the module files have been loaded - https://www.drupal.org/project/drupal/issues/3207813": "https://www.drupal.org/files/issues/2022-06-21/3207813-15.patch",
         "Paragraphs fields cause overflow of content forms in Claro-https://www.drupal.org/project/drupal/issues/3145188": "https://www.drupal.org/files/issues/2023-01-25/3145188-37_0.patch",
         "Querying with NULL values results in warning mb_strtolower() - https://www.drupal.org/project/drupal/issues/3302838": "https://www.drupal.org/files/issues/2022-08-23/3302838-13.patch",
-        "Refactor Xss::attributes() to allow filtering of style attribute values - https://www.drupal.org/project/drupal/issues/3109650#comment-15126604": "https://www.drupal.org/files/issues/2023-06-28/3109650-63.patch"
+        "Refactor Xss::attributes() to allow filtering of style attribute values - https://www.drupal.org/project/drupal/issues/3109650#comment-15443091": "https://www.drupal.org/files/issues/2024-02-15/drupal-n3109650-72-102x.patch"
       },
       "drupal/entity_embed": {
         "Entity embed dialog can no longer use custom data- attributes in CKEditor 5 - https://www.drupal.org/project/entity_embed/issues/3410132#comment-15546646": "https://www.drupal.org/files/issues/2024-04-11/Fixes-custom-data-attributes-issue-11.patch",
@@ -216,8 +215,8 @@
     "drupal/config_split": "^2.0",
     "drupal/config_update": "^2.0@alpha",
     "drupal/content_lock": "^2.3",
-    "drupal/core": "10.1.7",
-    "drupal/core-recommended": "10.1.7",
+    "drupal/core": "10.2.5",
+    "drupal/core-recommended": "10.2.5",
     "drupal/ctools": "^3.14",
     "drupal/diff": "^1.1",
     "drupal/dynamic_entity_reference": "^3.0",
@@ -275,7 +274,7 @@
     "giggsey/libphonenumber-for-php": "^8.13",
     "jquery/textcounter": "0.9.1",
     "jquery/timepicker": "1.14.0",
-    "lcobucci/clock": "3.0.0",
+    "lcobucci/clock": "3.2.0",
     "lesstif/php-jira-rest-client": "2.6.0",
     "respect/validation": "2.3.1"
   },