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

Use scaffold plugin and composer packages from Drupal core 8.8.0 #522

Merged
merged 17 commits into from
Dec 5, 2019

Conversation

greg-1-anderson
Copy link
Collaborator

@greg-1-anderson greg-1-anderson commented Sep 21, 2019

The new drupal/core-composer-scaffold plugin in Drupal 8.8.x-dev works with earlier versions of Drupal as well. Here is an early pull request to demonstrate that.

Still to do:

@greg-1-anderson
Copy link
Collaborator Author

Defaulting the location of [web-root] will not be done; see #3084369.

@greg-1-anderson
Copy link
Collaborator Author

We are working on

While these are merged, we still need to rewrite the corresponding metapackage. This will probably be the last time we need to rewrite a package; we won't do it any more once we have a stable alpha release.

@greg-1-anderson
Copy link
Collaborator Author

The metapackages have been rewritten.

@greg-1-anderson
Copy link
Collaborator Author

n.b: https://www.drupal.org/project/drupal/issues/3086148

The name of the scaffold metadata key in the composer.json extra section might change this week. Friday is the code freeze, so whatever is in at that point will be stable.

@greg-1-anderson
Copy link
Collaborator Author

The core Drupal issue referenced above has been merged, but the legacy scaffold assets metapackage has not been rewritten yet, so Drupal 8.7.x builds using these components will fail until this is done.

@greg-1-anderson
Copy link
Collaborator Author

OK, things should scaffold to the correct location again. I excluded a set of tests (Scaffold tests) that can't run here. We'll see if that gets us closer to passing; however, I also note that the tests are not passing on the master branch. I do wonder if running the Drupal tests is the best way to test this project. The Drupal test suite instructions specifically instruct that the tests should be run from a git clone + composer install, and not any other way. We may therefore have increasing failures when trying to run the same tests in the context of this project, simply because this is not a supported configuration for the tests. Also, those tests that do pass do not tell us that our project was assembled correctly, they only tell us that those tests will run in isolation, which is not necessarily relevant.

Perhaps we should just be satisfied with the site-install / runserver tests and not try to run the testsuite.

@greg-1-anderson
Copy link
Collaborator Author

If you are having trouble with drupal/core-recommended, see https://www.drupal.org/project/drupal/issues/3087531

@neclimdul
Copy link

I was manually testing this process to update a site. I'm having a bit of a conflict though and I'm not sure how best to resolve it.

Prior to this we used drupal/core which has ranged requirements on its packages. Projects are then in charge of managing their .lock file and any stricter versions of requirements. This is actually a contrib requirement for search_api_solr as documented in its installation guide.
https://git.drupalcode.org/project/search_api_solr#installation

composer require symfony/event-dispatcher:"4.3.4 as 3.4.99" drupal/search_api_solr

drupal/core-recommended on the other hand locks packages at specific releases. There's a lot to be said for that I'm sure but either some additional considerations need to happen or search_api_solr needs to update its installation guide because you can't run that install step with this approach because 3.4.99 != 3.4.32

@greg-1-anderson
Copy link
Collaborator Author

Projects that do not wish to use pinned dependencies may use drupal/core instead of drupal/core-recommended in their composer.json file.

composer.json Outdated Show resolved Hide resolved
composer.json Show resolved Hide resolved
.gitignore Outdated Show resolved Hide resolved
composer.json Outdated Show resolved Hide resolved
composer.json Outdated Show resolved Hide resolved
@webflo webflo changed the title [WIP] Use new scaffold plugin from Drupal core (8.8.x-dev) Use scaffold plugin and composer packages from Drupal core 8.8.0 Dec 5, 2019
@webflo webflo merged commit d2e7410 into drupal-composer:8.x Dec 5, 2019
@webflo
Copy link
Member

webflo commented Dec 5, 2019

Thanks @greg-1-anderson! Updated a few other things as well.

@jcnventura
Copy link
Collaborator

drupal/core-recommended on the other hand locks packages at specific releases. There's a lot to be said for that I'm sure but either some additional considerations need to happen or search_api_solr needs to update its installation guide because you can't run that install step with this approach because 3.4.99 != 3.4.32

Yes, the documentation for search_api_solr needs to be corrected to use 3.4.32 instead of 3.4.99. Otherwise, works fine.

lammensj pushed a commit to lammensj/drupal-project that referenced this pull request Dec 30, 2019
dannylamb pushed a commit to islandora-deprecated/drupal-project that referenced this pull request Jan 2, 2020
* Honor .env files and suggest usage (drupal-composer#351)

* Remove extra whitespace (drupal-composer#371)

* Updated argument name

* Bump minimal version

* Bump minimal version to 8.5.3

* Fix installer path for drush commandfiles.

* Update drupal-composer/drupal-scaffold

drupal-composer/drupal-scaffold is a full featured plugin and provides its own command.

* Fix tests on Travis CI (drupal-composer#405)

* Copy the editor config and gitattributes from drupal to the root. (drupal-composer#404)

* Remove "drupal-scaffold" from scripts (drupal-composer#275)

* Fix typo in README.md

* Remove unused use statement. (drupal-composer#406)

* Adjust default core patch level to -p2. (drupal-composer#418)

* Bump minimum required composer-patches version to support default patch level (drupal-composer#410)

* Update composer.json to require latest stable version of Drupal (drupal-composer#424)

* Require zaporylie/composer-drupal-optimizations (drupal-composer#442)

* Issue drupal-composer#408: Bump minimum PHP version to 5.6

* Removing redundant "--stability dev" from installation command (drupal-composer#450)

Fixes drupal-composer#449.

* Added "composer-exit-on-patch-failure": true option to composer.json (drupal-composer#420)

* Sync new lines at the end of the files (drupal-composer#453)

* Quote wildcards to avoid issues in some shells (drupal-composer#456)

* Add PHP 7.3 to Travis CI (drupal-composer#476)

* Change createRequiredFiles messages to reflect what occured (drupal-composer#467)

* Drop PHP 5.6 testing (drupal-composer#489)

* Bump minimum version to 8.7.0 (drupal-composer#488)

* Update .travis.yml

* Deprecate PHP 7.0 and 7.1 (drupal-composer#518)

* Revert "Deprecate PHP 7.1" (drupal-composer#521)

This reverts commit 5085410.

* Issue drupal-composer#518: Bump minimum php version to 7.0.8

* Update CI to Ubuntu 18.04 (drupal-composer#520)

* Revert "Update CI to Ubuntu 18.04" (drupal-composer#526)

This reverts commit ee5bf36.

* Add 'contrib' to Drush commandfile installer path (drupal-composer#525)

* Prefer usage of && operator instead of "and" (drupal-composer#530)

* update to drupal 8.8.0

* replace webflo/drupal-core-require-dev with drupal/core-dev

* Use scaffold plugin and composer packages from Drupal core 8.8.0 (drupal-composer#522)

* Issue drupal-composer#539: Remove deprecated CONFIG_SYNC_DIRECTORY

* update to 8.8.1

Co-authored-by: Moshe Weitzman <[email protected]>
Co-authored-by: Jakub Piasecki <[email protected]>
Co-authored-by: Markus Orenstrat <[email protected]>
Co-authored-by: Florian Weber <[email protected]>
Co-authored-by: Rodrigo <[email protected]>
Co-authored-by: Norman Kämper-Leymann <[email protected]>
Co-authored-by: Alex Milkovskyi <[email protected]>
Co-authored-by: Dezső BICZÓ <[email protected]>
Co-authored-by: Matthew Grasmick <[email protected]>
Co-authored-by: Andy Postnikov <[email protected]>
Co-authored-by: Hans Fredrik Nordhaug <[email protected]>
Co-authored-by: Maarten Segers <[email protected]>
Co-authored-by: Peter Kokot <[email protected]>
Co-authored-by: Simon Perdrisat <[email protected]>
Co-authored-by: Charles Tanton <[email protected]>
Co-authored-by: Greg Anderson <[email protected]>
Co-authored-by: Paul <[email protected]>
zanvidmar added a commit to oscarsergeant/drupal-project that referenced this pull request Feb 12, 2020
* Deprecate PHP 7.0 and 7.1 (drupal-composer#518)

* Revert "Deprecate PHP 7.1" (drupal-composer#521)

This reverts commit 5085410.

* Issue drupal-composer#518: Bump minimum php version to 7.0.8

* Update CI to Ubuntu 18.04 (drupal-composer#520)

* Revert "Update CI to Ubuntu 18.04" (drupal-composer#526)

This reverts commit ee5bf36.

* Add 'contrib' to Drush commandfile installer path (drupal-composer#525)

* Prefer usage of && operator instead of "and" (drupal-composer#530)

* Use scaffold plugin and composer packages from Drupal core 8.8.0 (drupal-composer#522)

* Issue drupal-composer#539: Remove deprecated CONFIG_SYNC_DIRECTORY

Co-authored-by: Maarten Segers <[email protected]>
Co-authored-by: Florian Weber <[email protected]>
Co-authored-by: Greg Anderson <[email protected]>
Co-authored-by: Paul <[email protected]>
shrop pushed a commit to shrop/drupal-project that referenced this pull request Apr 11, 2020
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

Successfully merging this pull request may close these issues.

5 participants