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

DT-1035: Fixes #3929: Move Drupal Scaffold to project composer.json. #3942

Merged
merged 8 commits into from
Dec 9, 2019

Conversation

danepowell
Copy link
Contributor

Fixes #3929

Changes proposed

  • Remove Drupal Scaffold from BLT's dependencies
  • Add Drupal Scaffold to the project template so new projects still get it
  • Add an update hook so existing projects still get it

Steps to replicate the issue

  1. Apply this patch and run blt update, ensure that Drupal Scaffold is added to your composer.json file and otherwise nothing changes.

Additional details

Should have no functional impact on projects, but it will free them and us up to migrate to Composer Scaffold at one's leisure. I don't want to backport this to 10.x since it requires a manual run of composer update, which users should be doing anyway during the 11.x upgrade.

@danepowell danepowell added Enhancement A feature or feature request 11.x Affects or applies to 11.x labels Dec 6, 2019
@danepowell
Copy link
Contributor Author

ORCA is pulling the 10.x stable release of blt-project, which is doubly bad because it should be 11.x, and it should also be the dev version from this PR.

@reubenmoes
Copy link

reubenmoes commented Dec 6, 2019

👍
I like this approach to resolving the composer-scaffold issue for 8.8 and BLT

@danepowell danepowell added Major change Requires change record (often BC-breaking) Subtree split labels Dec 6, 2019
@danepowell
Copy link
Contributor Author

danepowell commented Dec 6, 2019

@phenaproxima @TravisCarden BLT's ORCA builds here have suddenly started hitting the missing vfsStream dependency problem, as you can see in the last test run above (maybe because we forgot to update the SUT version 🙄 ). Did ya'll end up patching that in ORCA? Just wondering how to get this build passing.

@alexxed @adrianthedev please review this despite the failing test if you don't mind, so we can get it merged Monday.

@TravisCarden
Copy link
Contributor

@danepowell I'm actually rolling an ORCA hotfix for this issue right now. I'll report back shortly.

@TravisCarden
Copy link
Contributor

@danepowell I released the hotfix and restarted your failing build, but it now fails due to a patch that no longer applies. Obviously, I can't fix that for you on my side.

@danepowell
Copy link
Contributor Author

We still need the patch from acquia/orca#52 (against ORCA develop), but it conflicts due to the ORCA hotfix that only exists on master. Travis is going to fix that and then we should be unblocked.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
11.x Affects or applies to 11.x Enhancement A feature or feature request Major change Requires change record (often BC-breaking)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

DT-1035: drupal-composer/drupal-scaffold conflicts with drupal/core-composer-scaffold
5 participants