From 88219b60287d2c095f2a42b58957598f0ea5623d Mon Sep 17 00:00:00 2001
From: Rajab Natshah <rajabn@gmail.com>
Date: Sun, 19 Aug 2018 00:04:50 +0300
Subject: [PATCH] Issue #2993499: Start an 8.x-6.x new branch for [Varbase]
version: 8.x-6.x-dev and extra branch-alias with dev-8.x-6.x to 8.6.x-dev
---
.travis.yml | 12 +++++-----
composer.json | 56 +++++++++++++++++++-------------------------
drupal-org-core.make | 18 ++++----------
drupal-org.make | 34 +++++++++++++--------------
varbase.info.yml | 2 +-
5 files changed, 53 insertions(+), 69 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 852b5972..4a955256 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ cache:
- "$HOME/.selenium/cache"
php:
- - 7.1.19
+ - 7.2
env:
- AFATG=01-website-base-requirements
@@ -24,23 +24,23 @@ env:
matrix:
exclude:
# Automated Functional Acceptance Testing group: 01 website base requirements
- - php: 7.1.19
+ - php: 7.2
env: AFATG=01-website-base-requirements
# Automated Functional Acceptance Testing group: 02 user management
- - php: 7.1.19
+ - php: 7.2
env: AFATG=02-user-management
# Automated Functional Acceptance Testing group: 03 admin management
- - php: 7.1.19
+ - php: 7.2
env: AFATG=03-admin-management
# Automated Functional Acceptance Testing group: 04 content structure
- - php: 7.1.19
+ - php: 7.2
env: AFATG=04-content-structure
# Automated Functional Acceptance Testing group: 05 content-management
- - php: 7.1.19
+ - php: 7.2
env: AFATG=05-content-management
addons:
diff --git a/composer.json b/composer.json
index 62d06478..716c18b0 100644
--- a/composer.json
+++ b/composer.json
@@ -32,7 +32,7 @@
"cweagans/composer-patches": "1.6.4",
"drupal-composer/drupal-scaffold": "2.4.0",
"drupal/drupal-library-installer-plugin": "0.3",
- "drupal/core": "8.5.6",
+ "drupal/core": "8.6.0-rc1",
"drupal/config_update": "1.5",
"drupal/config_filter": "1.2",
"drupal/config_ignore": "2.1",
@@ -161,23 +161,23 @@
"drupal/anchor_link": "1.6",
"drupal/entity_browser_enhanced": "1.0-rc3",
"drupal/vmi": "2.0-alpha1",
- "drupal/varbase_core": "5.x-dev",
- "drupal/varbase_media": "5.x-dev",
- "drupal/varbase_bootstrap_paragraphs": "5.x-dev",
- "drupal/varbase_editor": "5.x-dev",
- "drupal/varbase_landing": "5.x-dev",
- "drupal/varbase_search": "5.x-dev",
- "drupal/varbase_seo": "5.x-dev",
- "drupal/varbase_heroslider_media": "5.x-dev",
- "drupal/varbase_carousels": "5.x-dev",
- "drupal/varbase_total_control": "5.x-dev",
- "drupal/varbase_auth" : "5.x-dev",
- "drupal/varbase_blog" : "5.x-dev",
- "drupal/varbase_styleguide": "5.x-dev",
- "drupal/vartheme": "5.x-dev",
- "drupal/vartheme_material": "5.x-dev",
- "drupal/vartheme_admin": "5.x-dev",
- "drupal/vartheme_material_admin": "5.x-dev",
+ "drupal/varbase_core": "6.x-dev",
+ "drupal/varbase_media": "6.x-dev",
+ "drupal/varbase_bootstrap_paragraphs": "6.x-dev",
+ "drupal/varbase_editor": "6.x-dev",
+ "drupal/varbase_landing": "6.x-dev",
+ "drupal/varbase_search": "6.x-dev",
+ "drupal/varbase_seo": "6.x-dev",
+ "drupal/varbase_heroslider_media": "6.x-dev",
+ "drupal/varbase_carousels": "6.x-dev",
+ "drupal/varbase_total_control": "6.x-dev",
+ "drupal/varbase_auth" : "6.x-dev",
+ "drupal/varbase_blog" : "6.x-dev",
+ "drupal/varbase_styleguide": "6.x-dev",
+ "drupal/vartheme": "6.x-dev",
+ "drupal/vartheme_material": "6.x-dev",
+ "drupal/vartheme_admin": "6.x-dev",
+ "drupal/vartheme_material_admin": "6.x-dev",
"mkalkbrenner/php-htmldiff-advanced": "~0.0.8",
"npm-asset/dropzone": "4.3.0",
"npm-asset/blazy": "1.8.2",
@@ -197,8 +197,8 @@
"behat/mink-selenium2-driver": "1.3.1",
"behatch/contexts": "3.1.0",
"emuse/behat-html-formatter": "0.1.0",
- "vardot/varbase_vmi_demo": "dev-8.x-5.x",
- "vardot/varbase_story_demo": "dev-8.x-5.x"
+ "vardot/varbase_vmi_demo": "dev-8.x-6.x",
+ "vardot/varbase_story_demo": "dev-8.x-6.x"
},
"config": {
"bin-dir": "bin/",
@@ -264,21 +264,13 @@
"patches": {
"drupal/core": {
"Issue #1356276: Allow profiles to provide a base_parent profile and load them in the correct order":
- "https://www.drupal.org/files/issues/1356278-408--8.5.x-real.patch",
+ "https://www.drupal.org/files/issues/2018-07-12/1356276-473.patch",
"Issue #2720101 Label (Title) not set for Views block (exposed filters in Block)":
- "https://www.drupal.org/files/issues/2720101-43.patch",
+ "https://www.drupal.org/files/issues/2720101-53.patch",
"Issue #2599228: Programmatically created translatable content type returns SQL error on content creation":
- "https://www.drupal.org/files/issues/2599228-31-tests-only.patch",
+ "https://www.drupal.org/files/issues/2018-08-08/2599228-58.patch",
"Issue #2893892: Fixed Warning Invalid argument supplied for foreach() in Drupal":
- "https://www.drupal.org/files/issues/patch_empty_fix.patch",
- "Issue #2877383: Add action support to Media module.":
- "https://www.drupal.org/files/issues/2877383-56.patch",
- "Issue #2670730: Provide a delete action for each content entity type.":
- "https://www.drupal.org/files/issues/2670730-81-89-8.5.0-rc1.patch",
- "Issue #2855521: Fix Drupalimage calling drupallink functions without checking if the plugin is loaded":
- "https://www.drupal.org/files/issues/edit_drupalimage-2855521-15.patch",
- "Issue #2936358: Layout Builder should be opt-in per display (entity type/bundle/view mode)":
- "https://www.drupal.org/files/issues/2018-07-28/2936358-opt_in-2936358-64-do-not-test.patch"
+ "https://www.drupal.org/files/issues/patch_empty_fix.patch"
},
"drupal/coffee": {
"Issue #2815381: Coffee breaks whole page when using right to left (rtl) languages in drupal 8":
diff --git a/drupal-org-core.make b/drupal-org-core.make
index 84b9e6bc..594de6f7 100644
--- a/drupal-org-core.make
+++ b/drupal-org-core.make
@@ -3,22 +3,14 @@ core = 8.x
; Drupal Core
projects[drupal][type] = "core"
-projects[drupal][version] = "8.5.6"
+projects[drupal][version] = "8.6.0-rc1"
;; Issue #1356276: Allow profiles to provide a base_parent profile and load them in the correct order
-projects[drupal][patch][] = https://www.drupal.org/files/issues/1356278-408--8.5.x-real.patch
+projects[drupal][patch][] = https://www.drupal.org/files/issues/2018-07-12/1356276-473.patch
;; Issue #2720101: Label (Title) not set for Views block (exposed filters in Block)
-projects[drupal][patch][] = https://www.drupal.org/files/issues/2720101-43.patch
+projects[drupal][patch][] = https://www.drupal.org/files/issues/2720101-53.patch
;; Issue #2853988: Add option to rewrite robots.txt on staging environments
projects[drupal][patch][] = https://www.drupal.org/files/issues/drupal_8-allow_stg_robots-2853988-2.patch
;; Issue #2599228: Programmatically created translatable content type returns SQL error on content creation
-projects[drupal][patch][] = https://www.drupal.org/files/issues/2599228-31-tests-only.patch
+projects[drupal][patch][] = https://www.drupal.org/files/issues/2018-08-08/2599228-58.patch
;; Issue #2893892: Fixed Warning Invalid argument supplied for foreach() in Drupal
-projects[drupal][patch][] = https://www.drupal.org/files/issues/patch_empty_fix.patch
-;; Issue #2877383: Add action support to Media module.
-projects[drupal][patch][] = https://www.drupal.org/files/issues/2877383-56.patch
-;; Issue #2670730: Provide a delete action for each content entity type.
-projects[drupal][patch][] = https://www.drupal.org/files/issues/2670730-81-89-8.5.0-rc1.patch
-;; Issue #2855521: Fix Drupalimage calling drupallink functions without checking if the plugin is loaded.
-projects[drupal][patch][] = https://www.drupal.org/files/issues/edit_drupalimage-2855521-15.patch
-;; Issue #2936358: Layout Builder should be opt-in per display (entity type/bundle/view mode)
-projects[drupal][patch][] = https://www.drupal.org/files/issues/2018-07-28/2936358-opt_in-2936358-64-do-not-test.patch
\ No newline at end of file
+projects[drupal][patch][] = https://www.drupal.org/files/issues/patch_empty_fix.patch
\ No newline at end of file
diff --git a/drupal-org.make b/drupal-org.make
index 829c46a6..3304ba6b 100644
--- a/drupal-org.make
+++ b/drupal-org.make
@@ -519,59 +519,59 @@ projects[total_control][patch][] = https://www.drupal.org/files/issues/2935351-2
;;;;;;;;;;;;;;;;;;;;;
projects[varbase_core][type] = module
-projects[varbase_core][version] = 5.x-dev
+projects[varbase_core][version] = 6.x-dev
projects[varbase_media][type] = module
-projects[varbase_media][version] = 5.x-dev
+projects[varbase_media][version] = 6.x-dev
projects[varbase_bootstrap_paragraphs][type] = module
-projects[varbase_bootstrap_paragraphs][version] = 5.x-dev
+projects[varbase_bootstrap_paragraphs][version] = 6.x-dev
projects[varbase_editor][type] = module
-projects[varbase_editor][version] = 5.x-dev
+projects[varbase_editor][version] = 6.x-dev
projects[varbase_landing][type] = module
-projects[varbase_landing][version] = 5.x-dev
+projects[varbase_landing][version] = 6.x-dev
projects[varbase_search][type] = module
-projects[varbase_search][version] = 5.x-dev
+projects[varbase_search][version] = 6.x-dev
projects[varbase_seo][type] = module
-projects[varbase_seo][version] = 5.x-dev
+projects[varbase_seo][version] = 6.x-dev
projects[varbase_heroslider_media][type] = module
-projects[varbase_heroslider_media][version] = 5.x-dev
+projects[varbase_heroslider_media][version] = 6.x-dev
projects[varbase_carousels][type] = module
-projects[varbase_carousels][version] = 5.x-dev
+projects[varbase_carousels][version] = 6.x-dev
projects[varbase_total_control][type] = module
-projects[varbase_total_control][version] = 5.x-dev
+projects[varbase_total_control][version] = 6.x-dev
projects[varbase_auth][type] = module
-projects[varbase_auth][version] = 5.x-dev
+projects[varbase_auth][version] = 6.x-dev
projects[varbase_blog][type] = module
-projects[varbase_blog][version] = 5.x-dev
+projects[varbase_blog][version] = 6.x-dev
projects[varbase_styleguide][type] = module
-projects[varbase_styleguide][version] = 5.x-dev
+projects[varbase_styleguide][version] = 6.x-dev
;;;;;;;;;;;;;;;;;;;;;
;; Varbase public contributed themes.
;;;;;;;;;;;;;;;;;;;;;
projects[vartheme][type] = theme
-projects[vartheme][version] = 5.x-dev
+projects[vartheme][version] = 6.x-dev
projects[vartheme_material][type] = theme
-projects[vartheme_material][version] = 5.x-dev
+projects[vartheme_material][version] = 6.x-dev
projects[vartheme_admin][type] = theme
-projects[vartheme_admin][version] = 5.x-dev
+projects[vartheme_admin][version] = 6.x-dev
projects[vartheme_material_admin][type] = theme
-projects[vartheme_material_admin][version] = 5.x-dev
+projects[vartheme_material_admin][version] = 6.x-dev
;;;;;;;;;;;;;;;;;;;;;
;; Libraries
diff --git a/varbase.info.yml b/varbase.info.yml
index b7a52668..c7662701 100755
--- a/varbase.info.yml
+++ b/varbase.info.yml
@@ -6,7 +6,7 @@ distribution:
name: Varbase
install:
theme: vartheme_admin
-version: 8.x-5.x-dev
+version: 8.x-6.x-dev
dependencies:
# core
- automated_cron
--
GitLab