From e19d1e120f29c638ed166e6fa522876b51eb7fd7 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Sun, 4 Feb 2018 13:24:43 +0000
Subject: [PATCH] #15 Update to Drush 9, add DCB and adjust license and CI
workflow
---
.gitlab-ci.yml | 4 ++++
composer.json | 5 +++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 16e920f..0657ffa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,3 +1,7 @@
Deploy:
script:
- curl -XPOST -H'content-type:application/json' "https://packagist.org/api/update-package?username=${PACKAGIST_USERNAME}&apiToken=${PACKAGIST_API_TOKEN}" -d'{"repository":{"url":"'${CI_PROJECT_URL}'"}}'
+ only:
+ - tags
+ - triggers
+ - schedules
diff --git a/composer.json b/composer.json
index 30f25a3..d8e0d4d 100644
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,7 @@
"Update"
],
"homepage": "https://gitlab.lakedrops.com/composer/plugin/drupal-8-scaffold",
- "license": "GPL-2.0+",
+ "license": "GPL-2.0-or-later",
"authors": [
{
"name": "Jürgen Haas",
@@ -54,13 +54,14 @@
"drupal/navbar_filter": "^1.1",
"drupal/security_review": "1.x-dev",
"drupal/stage_file_proxy": "^1.0-alpha3",
- "drush/drush": "9.0-beta4",
+ "drush/drush": "^9.0",
"lakedrops/composer-scripts": "^0.1",
"lakedrops/docker4drupal": "^0.8",
"lakedrops/dorgflow": "^0.3"
},
"require-dev": {
"composer/composer": "^1.5.0",
+ "drupal-code-builder/drupal-code-builder-drush": "^9.0",
"phpunit/phpunit": "^4.8.0"
},
"minimum-stability": "dev",
--
GitLab