diff --git a/.circleci/config.yml b/.circleci/config.yml index 2951dc8e5e0d31cc1c012bd741465a5e84957291..f4047eee92ceea8a43316a8fa2b6996e35c0bb58 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -138,7 +138,7 @@ commands: cd /var/www/html/test/ sudo chmod 775 . sudo chown www-data:circleci . - composer create-project vardot/varbase:9.0.x varbase --stability dev --no-interaction -vvv + composer create-project vardot/varbase:9.1.x varbase --stability dev --no-interaction -vvv cp -r /home/circleci/project /var/www/html/test/varbase/docroot/profiles/varbase cd /var/www/html/test/varbase sudo rm -rf config configbit css images libraries scripts src tests traslations varbase.info.yml varbase.install varbase.libraries.yml varbase.profile varbase.services.yml yarn.lock @@ -274,22 +274,22 @@ workflows: tags: only: /^9.*/ branches: - only: /^9.0.x/ + only: /^9.1.x/ - varbase-testing-02-user-management-03-admin-management: filters: tags: only: /^9.*/ branches: - only: /^9.0.x/ + only: /^9.1.x/ - varbase-testing-04-content-structure: filters: tags: only: /^9.*/ branches: - only: /^9.0.x/ + only: /^9.1.x/ - varbase-testing-05-content-management: filters: tags: only: /^9.*/ branches: - only: /^9.0.x/ + only: /^9.1.x/ diff --git a/README.md b/README.md index f12b1ed0766957835c3e8f543ab757eb8bdea2df..31da94d365343b885a2dad9e7cc56e268c2dadd3 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[](https://app.circleci.com/pipelines/github/Vardot/varbase/403/workflows/867137b5-171a-4fd7-a204-94e7ac3e50a6) Varbase 9.0.3 +[](https://app.circleci.com/pipelines/github/Vardot/varbase?branch=9.1.x) Varbase 9.1.x [](https://www.drupal.org/project/varbase) @@ -20,38 +20,34 @@ in every project. * [Tested, tested, and tested.](https://travis-ci.org/Vardot/varbase/builds) Starting a new project? Consider Varbase for Drupal 9. -Installing Varbase 9.0.x comes with several extra automated installation +Installing Varbase 9.1.x comes with several extra automated installation steps, to take full advantage of Varbase, other than the Drupal 9 installation instructions. # Install with Composer -To install the most recent stable release of Varbase 9.0.x run this command: -``` -composer create-project Vardot/varbase-project:~9 PROJECT_DIR_NAME --no-dev --no-interaction -``` -To install the dev version of Varbase 9.0.x run this command: +To install the dev version of Varbase 9.1.x run this command: ``` -composer create-project vardot/varbase-project:9.0.x-dev PROJECT_DIR_NAME --stability dev --no-interaction +composer create-project vardot/varbase-project:9.1.x-dev PROJECT_DIR_NAME --stability dev --no-interaction ``` -## [Create a new Vartheme sub theme for a project](https://github.com/Vardot/varbase/tree/9.0.x/scripts/README.md) +## [Create a new Vartheme sub theme for a project](https://github.com/Vardot/varbase/tree/9.1.x/scripts/README.md) -## [Automated Functional Testing](https://github.com/Vardot/varbase/blob/9.0.x/tests/README.md) +## [Automated Functional Testing](https://github.com/Vardot/varbase/blob/9.1.x/tests/README.md) -## [Varbase 9.0.x Developer Guide](https://docs.varbase.vardot.com) +## [Varbase 9.1.x Developer Guide](https://docs.varbase.vardot.com) -## [CHANGELOG for Varbase](https://github.com/Vardot/varbase/blob/9.0.x/CHANGELOG.md) +## [CHANGELOG for Varbase](https://github.com/Vardot/varbase/blob/9.1.x/CHANGELOG.md) -## [Varbase Gherkin features](https://github.com/Vardot/varbase/blob/9.0.x/tests/features/varbase/README.md) +## [Varbase Gherkin features](https://github.com/Vardot/varbase/blob/9.1.x/tests/features/varbase/README.md) ## [Varbase Developer Guide](https://docs.varbase.vardot.com) -## [CHANGELOG for Varbase](https://github.com/Vardot/varbase/blob/9.0.x/CHANGELOG.md) +## [CHANGELOG for Varbase](https://github.com/Vardot/varbase/blob/9.1.x/CHANGELOG.md) -## [General instructions on how to update Varbase](https://github.com/Vardot/varbase/blob/9.0.x/UPDATE.md) +## [General instructions on how to update Varbase](https://github.com/Vardot/varbase/blob/9.1.x/UPDATE.md) ## Local development with Lando diff --git a/UPDATE.md b/UPDATE.md index 0186615d0cdea296a7fdeab9e60c2fc06f880889..8c47150a634675a7334eddb7ac3277912d96ed9b 100644 --- a/UPDATE.md +++ b/UPDATE.md @@ -58,13 +58,13 @@ At the end of the update process, two log files are useful to troubleshoot 2. Edit your _composer.json_ file to be ready for updates. You have two choices. Edit your _composer.json_ to include all the new updates made in - [varbase-project](https://github.com/Vardot/varbase-project/blob/9.0.x/composer.json). + [varbase-project](https://github.com/Vardot/varbase-project/blob/9.1.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/9.0.x/composer.json). + [varbase-project](https://github.com/Vardot/varbase-project/blob/9.1.x/composer.json). 3. Back up your code and database 4. Execute Composer update to download updates to modules and libraries. `composer update` diff --git a/composer.json b/composer.json index b1bde64d2285998a8df8b7fd70774a8d4c353a83..78d0104011d8c3e9cdb719ce527548c172d785c8 100644 --- a/composer.json +++ b/composer.json @@ -34,14 +34,14 @@ "drupal/core": "~9.0", "drupal/varbase_core": "9.0.x-dev", "drupal/varbase_api": "9.0.x-dev", - "drupal/varbase_media": "9.0.x-dev", + "drupal/varbase_media": "9.1.x-dev", "drupal/varbase_editor": "9.0.x-dev", "drupal/varbase_landing": "9.0.x-dev", - "drupal/varbase_layout_builder": "10.0.x-dev", + "drupal/varbase_layout_builder": "10.1.x-dev", "drupal/varbase_bootstrap_paragraphs": "9.0.x-dev", "drupal/varbase_heroslider_media": "9.0.x-dev", "drupal/varbase_carousels": "9.0.x-dev", - "drupal/varbase_blog": "9.0.x-dev", + "drupal/varbase_blog": "9.1.x-dev", "drupal/varbase_search": "9.0.x-dev", "drupal/varbase_seo": "9.0.x-dev", "drupal/varbase_auth": "9.0.x-dev", @@ -49,7 +49,7 @@ "drupal/varbase_styleguide": "9.0.x-dev", "drupal/varbase_email": "9.0.x-dev", "drupal/varbase_workflow": "2.0.x-dev", - "drupal/vartheme_bs4": "9.0.x-dev", + "drupal/vartheme_bs5": "1.0.x-dev", "drupal/vartheme_claro": "3.0.x-dev", "vardot/entity-definition-update-manager": "~1.0", "bower-asset/objectfitpolyfill": "~2.0", diff --git a/tests/README.md b/tests/README.md index 032814ae48c399efc91b9f51516931931aad17fb..1f471e1b2ebad3d189946557bf6df8707cf8f720 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 9.0.x in the right way you will need to build varbase using +To test varbase 9.1.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:9.0.x-dev PROJECT_DIR_NAME --stability dev --no-interaction +composer create-project vardot/varbase:9.1.x-dev PROJECT_DIR_NAME --stability dev --no-interaction ``` -------------------------------------------------------------------------------- diff --git a/tests/features/varbase/README.md b/tests/features/varbase/README.md index fc19487029ed418a405ccb7032c5902287af4db7..6b994c8f9b81a540d2b6b88e46adc8eca7b6f09f 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 9.0.x +A list of features, and scenarios to have a full test over Varbase 9.1.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 63caf6956c9baaaa9fb21ec3a57dc6d66fbb9aeb..4245de1e75f485864d16022ddc176f5a51ddda1e 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 9.0.x + Scenario: Arabic installation for Varbase 9.1.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 391db251f7c62a708525e542330ec18335395e89..114cc29d6ba64af22f38daf4859770776be30745 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 9.0.x + Scenario: Default installation for Varbase 9.1.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 a1d0d81c2547d168255013d3c50c4172c60fef1e..4e53f0035a6bc4f435e2b2e5107293328a6cfaf6 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 9.0.x + Scenario: English installation for Varbase 9.1.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 6a95e54d5d8f172751759294582ccab50b9d91b8..31642176c772b5170599e4840b7156dbbbe14a96 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 9.0.x + Scenario: Multilingual installation for Varbase 9.1.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 041f27e9370a2ba2a5a32b6077b00f723e6b5321..2b56269d3f2bed0be4110e98117d9b3e3308bb8b 100755 --- a/varbase.info.yml +++ b/varbase.info.yml @@ -7,7 +7,7 @@ distribution: name: Varbase install: theme: vartheme_claro -version: 9.0.x-dev +version: 9.1.x-dev install: - system - action