Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Failing drupal core patch #263

Open
vanbbd opened this issue Jun 21, 2024 · 3 comments
Open

Failing drupal core patch #263

vanbbd opened this issue Jun 21, 2024 · 3 comments

Comments

@vanbbd
Copy link

vanbbd commented Jun 21, 2024

this patch is failing to apply:

https://git.drupalcode.org/project/drupal/-/commit/c271adb.diff

@markconroy
Copy link
Member

It looks like this has been fixed and merged to Drupal 11, and backported to Drupal 10.3 which was released yesterday.

It would be good to see if all is good with Drupal 10.3, and see what (if anything) we need to support 10.2.

===
Thanks to Big Blue Door for sponsoring my time to work on this.

@millnut
Copy link
Member

millnut commented Jun 27, 2024

I wonder if we can do something like the below so the patch only applies on < 10.3

 "extra": {
  "enable-patching": true,
  "patches": {
    "drupal/core": {
      "node_access filters out accessible nodes when node is left joined (1349080)" : "https://git.drupalcode.org/project/drupal/-/commit/c271adb.diff"
    }
  },
  "patches-ignore": {
    "drupal/core": {
      "node_access filters out accessible nodes when node is left joined (1349080)": "^10.3"
    }
  }
}

Although this will need testing as I'm not sure if this only works on a top-level composer file

@graham-web
Copy link

I wonder if we can do something like the below so the patch only applies on < 10.3

I don't think patches-ignore actually accepts a version range! 😞 (This article suggests it does, but it doesn't correspond to the documentation or code in the 1.x version of cweagans/composer-patches that I'm looking at...)

That said, thanks @millnut for the suggestion - I just did the following on a site composer.json which allowed an upgrade to Drupal 10.3 to work cleanly.

        "patches-ignore": {
            "localgovdrupal/localgov_services": {
                "drupal/core": {
                    "node_access filters out accessible nodes when node is left joined (1349080)" : "https://git.drupalcode.org/project/drupal/-/commit/c271adb.diff"
                }
            }
        },

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

4 participants