Merge pull request #252 from openeuropa/OEL-2794

OEL-2794: Update components to run on Drupal 10.2.x
openeuropa · Feb 12, 2024 · d6882d3 · d6882d3
2 parents 7d2119e + 11e5387
commit d6882d3
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 14 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -44,6 +44,20 @@ pipeline:
       - npm install --unsafe-perm
       - NODE_ENV=production npm run production
 
+  composer-change-patch:
+    group: warmup
+    image: registry.fpfis.eu/fpfis/httpd-php:${PHP_VERSION}-ci
+    volumes:
+      - /cache:/cache
+    commands:
+      - >
+        composer config --merge --json "extra.patches.drupal/core" '{"https://www.drupal.org/project/drupal/issues/2230909": "https://www.drupal.org/files/issues/2022-07-26/2230909-269.patch"}'
+      - >
+        composer config --merge --json "extra.patches-ignore.openeuropa/oe_content" '{"drupal/core": {"Drupal 10.2.x only - see oe_content/README.md for 10.1.x - https://www.drupal.org/project/drupal/issues/2230909": "https://www.drupal.org/files/issues/2023-12-21/2230909-309.patch"}}'
+    when:
+      matrix:
+        CORE_VERSION: "10.1.0"
+
   composer-install:
     group: prepare
     image: registry.fpfis.eu/fpfis/httpd-php:${PHP_VERSION}-ci
@@ -91,7 +105,7 @@ pipeline:
     when:
       event: tag
       matrix:
-        CORE_VERSION: "10.0.0"
+        CORE_VERSION: "10.1.0"
         PHP_VERSION: "8.1"
 
   github-release:
@@ -103,16 +117,16 @@ pipeline:
     when:
       event: tag
       matrix:
-        CORE_VERSION: "10.0.0"
+        CORE_VERSION: "10.1.0"
         PHP_VERSION: "8.1"
 
 matrix:
   include:
-    - CORE_VERSION: 10.0.0
-      PHP_VERSION: 8.1
-    - CORE_VERSION: 10.0.0
-      PHP_VERSION: 8.2
     - CORE_VERSION: 10.1.0
       PHP_VERSION: 8.1
     - CORE_VERSION: 10.1.0
       PHP_VERSION: 8.2
+    - CORE_VERSION: 10.2.0
+      PHP_VERSION: 8.1
+    - CORE_VERSION: 10.2.0
+      PHP_VERSION: 8.2
diff --git a/composer.json b/composer.json
@@ -29,13 +29,13 @@
         "drupal/search_api": "^1.29",
         "drupal/search_api_autocomplete": "^1.7",
         "drupal/typed_link": "^2.0.1",
-        "drush/drush": "^11.1",
+        "drush/drush": "^12",
         "mikey179/vfsstream": "^1.6.10",
         "nikic/php-parser": "^4",
         "openeuropa/code-review": "^2.0.0-alpha6",
         "openeuropa/oe_authentication": "^1.11",
         "openeuropa/oe_contact_forms": "~1.11",
-        "openeuropa/oe_content": "^3.0.0-alpha11",
+        "openeuropa/oe_content": "^3",
         "openeuropa/oe_content_extra": "^1.1.0",
         "openeuropa/oe_corporate_blocks": "^4.13",
         "openeuropa/oe_link_lists": "^1.0",

diff --git a/modules/oe_whitelabel_paragraphs/tests/src/Functional/GalleryParagraphTest.php b/modules/oe_whitelabel_paragraphs/tests/src/Functional/GalleryParagraphTest.php
@@ -86,7 +86,7 @@ public function testRendering(): void {
         ],
         'media' => [
           'caption_title' => 'Euro with miniature figurines',
-          'rendered' => '<img class="avportal-photo img-fluid" alt="Euro with miniature figurines" data-src="//ec.europa.eu/avservices/avs/files/video6/repository/prod/photo/store/store2/4/P038924-352937.jpg">',
+          'rendered' => '<img class="avportal-photo img-fluid" alt="Euro with miniature figurines" data-src="https://ec.europa.eu/avservices/avs/files/video6/repository/prod/photo/store/store2/4/P038924-352937.jpg">',
         ],
       ],
       [
@@ -100,7 +100,7 @@ public function testRendering(): void {
         ],
         'media' => [
           'caption_title' => 'Economic and Financial Affairs Council - Arrivals',
-          'rendered' => '<iframe id="videoplayerI-163162" data-src="//ec.europa.eu/avservices/play.cfm?ref=I-163162&amp;lg=EN&amp;sublg=none&amp;autoplay=true&amp;tin=10&amp;tout=59" frameborder="0" allowtransparency allowfullscreen webkitallowfullscreen mozallowfullscreen width="640" height="390" class="media-avportal-content"></iframe>',
+          'rendered' => '<iframe id="videoplayerI-163162" data-src="https://ec.europa.eu/avservices/play.cfm?ref=I-163162&amp;lg=EN&amp;sublg=none&amp;autoplay=true&amp;tin=10&amp;tout=59" frameborder="0" allowtransparency allowfullscreen webkitallowfullscreen mozallowfullscreen width="640" height="390" class="media-avportal-content"></iframe>',
         ],
       ],
       [

diff --git a/modules/oe_whitelabel_paragraphs/tests/src/Kernel/Paragraphs/CarouselTest.php b/modules/oe_whitelabel_paragraphs/tests/src/Kernel/Paragraphs/CarouselTest.php
@@ -166,7 +166,7 @@ public function testRendering(): void {
             'label' => 'CTA 2',
             'path' => 'http://www.example.com/',
           ],
-          'image' => '<img src="//ec.europa.eu/avservices/avs/files/video6/repository/prod/photo/store/store2/4/P038924-352937.jpg" alt="Euro with miniature figurines" class="d-block w-100">',
+          'image' => '<img src="https://ec.europa.eu/avservices/avs/files/video6/repository/prod/photo/store/store2/4/P038924-352937.jpg" alt="Euro with miniature figurines" class="d-block w-100">',
         ],
         [
           'caption_title' => 'Item 3',
@@ -182,7 +182,7 @@ public function testRendering(): void {
             'label' => 'CTA 4',
             'path' => '/',
           ],
-          'image' => '<img src="//ec.europa.eu/avservices/avs/files/video6/repository/prod/photo/store/store2/4/P038924-352937.jpg" alt="Euro with miniature figurines" class="d-block w-100">',
+          'image' => '<img src="https://ec.europa.eu/avservices/avs/files/video6/repository/prod/photo/store/store2/4/P038924-352937.jpg" alt="Euro with miniature figurines" class="d-block w-100">',
         ],
       ],
     ];
@@ -213,7 +213,7 @@ public function testRendering(): void {
             'label' => 'BG CTA 2',
             'path' => 'http://www.example.com/',
           ],
-          'image' => '<img src="//ec.europa.eu/avservices/avs/files/video6/repository/prod/photo/store/store2/4/P038924-352937.jpg" alt="AV Portal photo bg" class="d-block w-100">',
+          'image' => '<img src="https://ec.europa.eu/avservices/avs/files/video6/repository/prod/photo/store/store2/4/P038924-352937.jpg" alt="AV Portal photo bg" class="d-block w-100">',
         ],
         [
           'caption_title' => 'BG Item 3',
@@ -229,7 +229,7 @@ public function testRendering(): void {
             'label' => 'BG CTA 4',
             'path' => 'http://www.example.com/',
           ],
-          'image' => '<img src="//ec.europa.eu/avservices/avs/files/video6/repository/prod/photo/store/store2/4/P038924-352937.jpg" alt="AV Portal photo bg" class="d-block w-100">',
+          'image' => '<img src="https://ec.europa.eu/avservices/avs/files/video6/repository/prod/photo/store/store2/4/P038924-352937.jpg" alt="AV Portal photo bg" class="d-block w-100">',
         ],
       ],
     ];