EWPP-0000: Update remote_stream_wrapper.

openeuropa · Jul 15, 2024 · 474a7e7 · 474a7e7
1 parent 952c104
commit 474a7e7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 16 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -34,20 +34,6 @@ services:
     - NODE_MAX_SESSION=5
 
 pipeline:
-  composer-change-patch:
-    group: warmup
-    image: registry.fpfis.eu/fpfis/httpd-php:${PHP_VERSION}-ci
-    volumes:
-      - /cache/${DRONE_REPO_NAME}:/cache
-    commands:
-      - composer self-update --2
-      # Unset the patch for 10.2.x.
-      - >
-        composer config --json "extra.patches" '{"drupal/remote_stream_wrapper": {"https://www.drupal.org/project/remote_stream_wrapper/issues/3050183": "https://www.drupal.org/files/issues/2020-08-21/3050183-4.patch"}}'
-    when:
-      matrix:
-        CORE_VERSION: "10.2.0"
-
   composer-install:
     group: prepare
     image: registry.fpfis.eu/fpfis/httpd-php:${PHP_VERSION}-ci

diff --git a/composer.json b/composer.json
@@ -44,8 +44,7 @@
     "extra": {
         "patches": {
             "drupal/remote_stream_wrapper": {
-                "https://www.drupal.org/project/remote_stream_wrapper/issues/3050183": "https://www.drupal.org/files/issues/2020-08-21/3050183-4.patch",
-                "Drupal 10.3.x only - see media_avportal/README.md for 10.2.x - https://www.drupal.org/project/remote_stream_wrapper/issues/3437974": "https://www.drupal.org/files/issues/2024-06-21/drupal_10_3_deliver_signature_change-3437974-2_0_0-18.patch"
+                "https://www.drupal.org/project/remote_stream_wrapper/issues/3050183": "https://www.drupal.org/files/issues/2020-08-21/3050183-4.patch"
             }
         },
         "composer-exit-on-patch-failure": true,