drupalci.yml: Further edits to attempt successful build.

drupalci.yml

@@ -16,16 +16,6 @@ build:
       update_build:
   assessment:
     validate_codebase:
-      # Required to enable patching of dependencies.
-      #
-      # @see https://www.drupal.org/project/config_enforce_devel/issues/3307885
-      container_command:
-        commands:
-          - cd ${SOURCE_DIR}
-          - sudo -u www-data composer config --no-plugins allow-plugins.cweagans/composer-patches true
-          - sudo -u www-data composer config extra.enable-patching true
-          - sudo -u www-data composer config extra.composer-exit-on-patch-failure true
-        halt-on-fail: true
       phplint:
       container_composer:
       phpcs:
@@ -46,6 +36,8 @@ build:
           - sudo -u www-data composer config --no-plugins allow-plugins.cweagans/composer-patches true
           - sudo -u www-data composer config extra.enable-patching true
           - sudo -u www-data composer config extra.composer-exit-on-patch-failure true
+          # Note: this must be kept up to date with what's in our composer.json.
+          - sudo -u www-data composer require "cweagans/composer-patches:^1.5.0"
         halt-on-fail: true
       run_tests.phpunit:
         types: 'PHPUnit-Unit'