diff --git a/README.md b/README.md index fd6dcc76ef84df3c771ce6b29b3a5db47e8b4f78..06cdad50f89d0a47eb3e70adeb0dea0150388308 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[](https://travis-ci.org/Vardot/varbase/builds/535604696) Varbase 8.6.10 +[](https://travis-ci.org/Vardot/varbase) Varbase 8.7.x [](https://www.drupal.org/project/varbase) @@ -20,30 +20,26 @@ in every project. * [Tested, tested, and tested.](https://travis-ci.org/Vardot/varbase/builds) Starting a new project? Consider Varbase for Drupal 8. -Installing Varbase 8.x-6.x comes with several extra automated installation +Installing Varbase 8.x-7.x comes with several extra automated installation steps, to take full advantage of Varbase, other than the Drupal 8 installation instructions. # Install with Composer -To install the most recent stable release of Varbase 8.6.x run this command: -``` -composer create-project Vardot/varbase-project:^8.6.10 PROJECT_DIR_NAME --no-dev --no-interaction -``` -To install the dev version of Varbase 8.6.x run this command: +To install the dev version of Varbase 8.7.x run this command: ``` -composer create-project vardot/varbase-project:8.6.x-dev PROJECT_DIR_NAME --stability dev --no-interaction +composer create-project vardot/varbase-project:8.7.x-dev PROJECT_DIR_NAME --stability dev --no-interaction ``` -## [Create a new Vartheme sub theme for a project](https://github.com/Vardot/varbase/tree/8.x-6.x/scripts/README.md) +## [Create a new Vartheme sub theme for a project](https://github.com/Vardot/varbase/tree/8.x-7.x/scripts/README.md) -## [Automated Functional Testing](https://github.com/Vardot/varbase/blob/8.x-6.x/tests/README.md) +## [Automated Functional Testing](https://github.com/Vardot/varbase/blob/8.x-7.x/tests/README.md) -## [Varbase Gherkin features](https://github.com/Vardot/varbase/blob/8.x-6.x/tests/features/varbase/README.md) +## [Varbase Gherkin features](https://github.com/Vardot/varbase/blob/8.x-7.x/tests/features/varbase/README.md) -## [Varbase 8.6.x Developer Guide](https://docs.varbase.vardot.com) +## [Varbase 8.7.x Developer Guide](https://docs.varbase.vardot.com) -## [CHANGELOG for Varbase](https://github.com/Vardot/varbase/blob/8.x-6.x/CHANGELOG.md) +## [CHANGELOG for Varbase](https://github.com/Vardot/varbase/blob/8.x-7.x/CHANGELOG.md) -## [General instructions on how to update Varbase](https://github.com/Vardot/varbase/blob/8.x-6.x/UPDATE.md) +## [General instructions on how to update Varbase](https://github.com/Vardot/varbase/blob/8.x-7.x/UPDATE.md) diff --git a/UPDATE.md b/UPDATE.md index 5f5614e8c1e486cd95394ec8fda95bfa1e5d96aa..6337164751f94c598faaaa752d864116e87725c1 100644 --- a/UPDATE.md +++ b/UPDATE.md @@ -39,7 +39,7 @@ At the end of the update process, two log files are useful to troubleshoot your 1. From a command prompt window, navigate to your project: `cd /path/to/YOUR_PROJECT` 2. Edit your _composer.json_ file to be ready for updates. You have two choices. - 1. **The hard way:** Edit your _composer.json_ to include all the new updates made in [varbase-project](https://github.com/Vardot/varbase-project/blob/8.6.x/composer.json). This includes the new components required and its versions _"require"_, _"repositories"_, _"extra"_, and any other important config. You can use a diff tool such as [Meld](http://meldmerge.org/) or [DiffMerge](https://sourcegear.com/diffmerge/) to help you diff between your old _composer.json_ and the new one from [varbase-project](https://github.com/Vardot/varbase-project/blob/8.6.x/composer.json). + 1. **The hard way:** Edit your _composer.json_ to include all the new updates made in [varbase-project](https://github.com/Vardot/varbase-project/blob/8.7.x/composer.json). This includes the new components required and its versions _"require"_, _"repositories"_, _"extra"_, and any other important config. You can use a diff tool such as [Meld](http://meldmerge.org/) or [DiffMerge](https://sourcegear.com/diffmerge/) to help you diff between your old _composer.json_ and the new one from [varbase-project](https://github.com/Vardot/varbase-project/blob/8.7.x/composer.json). 2. **The easy way:** 1. If you're using Varbase 8.6.2 or older, install [varbase-updater](https://github.com/Vardot/varbase-updater) through Composer. `composer require vardot/varbase-updater` If you're using Varbase 8.6.3 or newer, skip this step; [varbase-updater](https://github.com/Vardot/varbase-updater) comes pre-installed with your Varbase project. 2. Then run: `composer varbase-refactor-composer composer.new.json docroot` where _docroot_ is your Drupal project codebase. diff --git a/build-varbase.make b/build-varbase.make index f786455265bdbfc356d8e860ec53ce14ab959639..16d8a6be1c8274d739b80f8e1ca8a9673f44945a 100644 --- a/build-varbase.make +++ b/build-varbase.make @@ -4,4 +4,4 @@ includes[] = drupal-org-core.make projects[varbase][type] = profile projects[varbase][download][type] = git -projects[varbase][download][branch] = 8.x-6.x +projects[varbase][download][branch] = 8.x-7.x diff --git a/composer.json b/composer.json index 0d93eec911779e320028aa6ca28ecba69d7482d3..8c6614d4df12f60d335ab47e41996cf6304cfa85 100644 --- a/composer.json +++ b/composer.json @@ -32,18 +32,18 @@ "cweagans/composer-patches": "~1.0", "drupal-composer/drupal-scaffold": "~2.0", "drupal/drupal-library-installer-plugin": "^0.3", - "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_core": "7.x-dev", + "drupal/varbase_media": "7.x-dev", + "drupal/varbase_bootstrap_paragraphs": "7.x-dev", + "drupal/varbase_editor": "7.x-dev", + "drupal/varbase_landing": "7.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_heroslider_media": "7.x-dev", + "drupal/varbase_carousels": "7.x-dev", "drupal/varbase_total_control": "6.x-dev", "drupal/varbase_auth": "6.x-dev", - "drupal/varbase_blog": "6.x-dev", + "drupal/varbase_blog": "7.x-dev", "drupal/varbase_styleguide": "6.x-dev", "drupal/varbase_email": "6.x-dev", "drupal/vartheme": "6.x-dev", @@ -97,7 +97,7 @@ }, "extra": { "branch-alias": { - "dev-8.x-6.x": "8.6.x-dev" + "dev-8.x-7.x": "8.7.x-dev" }, "installer-types": [ "bower-asset", diff --git a/drupal-org.make b/drupal-org.make index a994581930849f1754e82a7fed8efca9305c934a..777345b158b09a86838df87a508a2aa1aa727ac3 100644 --- a/drupal-org.make +++ b/drupal-org.make @@ -468,19 +468,19 @@ projects[total_control][patch][] = https://www.drupal.org/files/issues/2935351-2 ;;;;;;;;;;;;;;;;;;;;; projects[varbase_core][type] = module -projects[varbase_core][version] = 6.x-dev +projects[varbase_core][version] = 7.x-dev projects[varbase_media][type] = module -projects[varbase_media][version] = 6.x-dev +projects[varbase_media][version] = 7.x-dev projects[varbase_bootstrap_paragraphs][type] = module -projects[varbase_bootstrap_paragraphs][version] = 6.x-dev +projects[varbase_bootstrap_paragraphs][version] = 7.x-dev projects[varbase_editor][type] = module -projects[varbase_editor][version] = 6.x-dev +projects[varbase_editor][version] = 7.x-dev projects[varbase_landing][type] = module -projects[varbase_landing][version] = 6.x-dev +projects[varbase_landing][version] = 7.x-dev projects[varbase_search][type] = module projects[varbase_search][version] = 6.x-dev @@ -489,10 +489,10 @@ projects[varbase_seo][type] = module projects[varbase_seo][version] = 6.x-dev projects[varbase_heroslider_media][type] = module -projects[varbase_heroslider_media][version] = 6.x-dev +projects[varbase_heroslider_media][version] = 7.x-dev projects[varbase_carousels][type] = module -projects[varbase_carousels][version] = 6.x-dev +projects[varbase_carousels][version] = 7.x-dev projects[varbase_total_control][type] = module projects[varbase_total_control][version] = 6.x-dev @@ -501,7 +501,7 @@ projects[varbase_auth][type] = module projects[varbase_auth][version] = 6.x-dev projects[varbase_blog][type] = module -projects[varbase_blog][version] = 6.x-dev +projects[varbase_blog][version] = 7.x-dev projects[varbase_styleguide][type] = module projects[varbase_styleguide][version] = 6.x-dev diff --git a/tests/README.md b/tests/README.md index c0f3ff2f1391926f48b5fddfe27bbaa9052f7d30..8700235f9c89ccd974523f4a750597e489e4ab29 100644 --- a/tests/README.md +++ b/tests/README.md @@ -8,13 +8,13 @@ This page can help you to have the list all steps, which you need to run the Behat Gherkin Features to test a varbase website in your localhost machine. -To test varbase 8.x-6.x in the right way you will need to build varbase using +To test varbase 8.x-7.x in the right way you will need to build varbase using the composer. ## Create a Varbase project with [Composer](https://getcomposer.org/download/): ``` -composer create-project vardot/varbase:8.6.x-dev PROJECT_DIR_NAME --stability dev --no-interaction +composer create-project vardot/varbase:8.7.x-dev PROJECT_DIR_NAME --stability dev --no-interaction ``` -------------------------------------------------------------------------------- diff --git a/tests/features/varbase/README.md b/tests/features/varbase/README.md index 90fb9b557320b22338a29d7a733e22247620d53c..3198334d5f40833482b9f0597aa09250020b6c0e 100644 --- a/tests/features/varbase/README.md +++ b/tests/features/varbase/README.md @@ -1,6 +1,6 @@ # Varbase Gherkin features -A list of features, and scenarios to have a full test over Varbase 8.x-6.x +A list of features, and scenarios to have a full test over Varbase 8.x-7.x If you want to run all Gherkin Features over a new Varbase site. You will need to create the list of Testing users, Arabic diff --git a/tests/tools/install-varbase/arabic-installation.feature b/tests/tools/install-varbase/arabic-installation.feature index 9773dd4517a12f67f4eaf66767f17b8dd440acf0..2d9dff02b59bf5c47feffe5dc36c7433ebef94ec 100644 --- a/tests/tools/install-varbase/arabic-installation.feature +++ b/tests/tools/install-varbase/arabic-installation.feature @@ -4,7 +4,7 @@ I want to be able to install Varbase for a selected client So that I will be able to initiate the site with the default installation @javascript @tools @install @local @development - Scenario: Arabic installation for Varbase 8.x-6.x + Scenario: Arabic installation for Varbase 8.x-7.x Given I go to "/core/install.php" And I wait Then I should see "Choose language" diff --git a/tests/tools/install-varbase/default-installation.feature b/tests/tools/install-varbase/default-installation.feature index 445059efd3b277d8d6d1fb82dca31f9a2c6932c6..313e71023cfe054052bd5f9e3f962454312cae5c 100644 --- a/tests/tools/install-varbase/default-installation.feature +++ b/tests/tools/install-varbase/default-installation.feature @@ -4,7 +4,7 @@ I want to be able to install Varbase for a selected client So that I will be able to initiate the site with the default installation @javascript @tools @install @local @development - Scenario: Default installation for Varbase 8.x-6.x + Scenario: Default installation for Varbase 8.x-7.x Given I go to "/core/install.php" And I wait Then I should see "Choose language" diff --git a/tests/tools/install-varbase/english-language-installation.feature b/tests/tools/install-varbase/english-language-installation.feature index df1273086e876e9925bd18e4cc083cf60536a943..daa9a32ed03280d45a883b16711f87a867559164 100644 --- a/tests/tools/install-varbase/english-language-installation.feature +++ b/tests/tools/install-varbase/english-language-installation.feature @@ -4,7 +4,7 @@ I want to be able to install Varbase for a selected client So that I will be able to initiate the site with the default installation @javascript @tools @install @local @development - Scenario: English installation for Varbase 8.x-6.x + Scenario: English installation for Varbase 8.x-7.x Given I go to "/core/install.php" And I wait Then I should see "Choose language" diff --git a/tests/tools/install-varbase/multilingual-installation.feature b/tests/tools/install-varbase/multilingual-installation.feature index a75d2160c9e15c24ddd10561e0cc6a36e360d17d..b745952efa9d1bec51d1abce3a68217d88298f36 100644 --- a/tests/tools/install-varbase/multilingual-installation.feature +++ b/tests/tools/install-varbase/multilingual-installation.feature @@ -4,7 +4,7 @@ I want to be able to install Varbase for a selected client So that I will be able to initiate the site with the default installation @javascript @tools @install @local @development - Scenario: Multilingual installation for Varbase 8.x-6.x + Scenario: Multilingual installation for Varbase 8.x-7.x Given I go to "/core/install.php" And I wait Then I should see "Choose language" diff --git a/varbase.info.yml b/varbase.info.yml index 9aaf303baf5c9a0b129f961fc6a1997ebbd6eef1..a66375e22c0c49d7da051598fbcd479e8921e734 100755 --- a/varbase.info.yml +++ b/varbase.info.yml @@ -7,7 +7,7 @@ distribution: name: Varbase install: theme: vartheme_admin -version: 8.x-6.x-dev +version: 8.x-7.x-dev install: - system - action