Setup ramsalt/drupal-project for Drupal 9 (#18)

* Add Drupal 9 compatible release using a new custom ramsalt scaffolding dependency
* Add ramsalt/drupal-scaffold as a dependency
* Fix the name of the ramsalt scaffold repository
* Don’t ignore /web/sites/*/settings.php, since we do not store sensitive informations.
* [CI] Update Action to reflect the new changes

Co-authored-by: Marlon (esolitos) Saglia <[email protected]>

Author: szeidler

.github/workflows/ci.yml

@@ -6,6 +6,8 @@ env:
   COMPOSER_MEMORY_LIMIT: -1
   SIMPLETEST_DB: sqlite://tmp/site.sqlite
   SIMPLETEST_BASE_URL: "http://127.0.0.1:8080"
+  COMPOSER_AUTH: ${{ secrets.COMPOSER_AUTH }}
+  WODBY_ENVIRONMENT_TYPE: CI
 
 jobs:
   build:
@@ -51,10 +53,10 @@ jobs:
         run: composer --verbose install
 
       - if: matrix.drupal-release == 'dev'
-        run: composer --verbose require --no-update drupal/core-recommended:9.2.x-dev && composer --verbose require --no-update --dev drupal/core-dev:9.2.x-dev
-
-      - if: matrix.drupal-release == 'dev'
-        run: composer --verbose update
+        run: |
+          composer --verbose require --no-update drupal/core-recommended:9.2.x-dev
+          composer --verbose require --no-update --dev drupal/core-dev:9.2.x-dev
+          composer --verbose update
 
       - run: ./vendor/bin/drush site-install --verbose --yes --db-url=sqlite://tmp/site.sqlite
 

.gitignore

@@ -8,7 +8,6 @@
 /web/libraries/
 
 # Ignore sensitive information
-/web/sites/*/settings.php
 /web/sites/*/settings.local.php
 
 # Ignore Drupal's file directory

composer.json

@@ -1,27 +1,33 @@
 {
-    "name": "drupal-composer/drupal-project",
+    "name": "ramsalt/drupal-project",
     "description": "Project template for Drupal 9 projects with Composer",
     "type": "project",
     "license": "GPL-2.0-or-later",
     "authors": [
         {
-            "name": "",
+            "name": "Marlon <[email protected]>",
             "role": ""
-        }
-    ],
-    "repositories": [
+        },
         {
-            "type": "composer",
-            "url": "https://packages.drupal.org/8"
+            "name": "Stephan <[email protected]>",
+            "role": ""
         }
     ],
+    "repositories": {
+        "private-packagist": {
+            "type": "composer",
+            "url": "https://repo.packagist.com/ramsalt/"
+        },
+        "packagist.org": false
+    },
     "require": {
         "php": ">=7.3",
         "composer/installers": "^1.9",
         "cweagans/composer-patches": "^1.7",
         "drupal/core-composer-scaffold": "^9.1",
         "drupal/core-recommended": "^9.1",
         "drush/drush": "^10.3",
+        "ramsalt/drupal-scaffold": "*",
         "vlucas/phpdotenv": "^5.1",
         "webflo/drupal-finder": "^1.2"
     },
@@ -60,6 +66,9 @@
     },
     "extra": {
         "drupal-scaffold": {
+            "allowed-packages": [
+                "ramsalt/drupal-scaffold"
+            ],
             "locations": {
                 "web-root": "web/"
             }
@@ -76,7 +85,7 @@
         "patchLevel": {
             "drupal/core": "-p2"
         },
-        "patches": {
-        }
+        "enable-patching": true,
+        "patches-file": "composer.patches.json"
     }
 }

composer.patches.json

@@ -0,0 +1,3 @@
+{
+  "patches": {}
+}