Commit e05015ad authored by Rajab Natshah's avatar Rajab Natshah 💬
Browse files

Issue #3277336: Start a 10.0.x branch for Varbase distribution to support Drupal ~10.0

parent d7c4eaf7

.circleci/config.yml

+9 −9
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ commands: 
            cd /var/www/html/test/

            sudo chmod 775 .

            sudo chown www-data:circleci .

            git clone --branch '9.1.x' https://github.com/vardot/varbase.git /var/www/html/test/varbase-code

            git clone --branch '10.0.x' https://github.com/vardot/varbase.git /var/www/html/test/varbase-code

            cp -r /var/www/html/test/varbase-code /var/www/html/test/varbase

            cd /var/www/html/test/varbase

            composer install --no-interaction -vvv
@@ -295,24 +295,24 @@ workflows: 
      - varbase-testing-01-website-base-requirements:

          filters:

            tags:

              only: /^9.1.*/

              only: /^10.0.*/

            branches:

              only: /^9.1.x/

              only: /^10.0.x/

      - varbase-testing-02-user-management-03-admin-management:

          filters:

            tags:

              only: /^9.1.*/

              only: /^10.0.*/

            branches:

              only: /^9.1.x/

              only: /^10.0.x/

      - varbase-testing-04-content-structure:

          filters:

            tags:

              only: /^9.1.*/

              only: /^10.0.*/

            branches:

              only: /^9.1.x/

              only: /^10.0.x/

      - varbase-testing-05-content-management:

          filters:

            tags:

              only: /^9.1.*/

              only: /^10.0.*/

            branches:

              only: /^9.1.x/
 
              only: /^10.0.x/

README.md

+12 −12
Original line number Diff line number Diff line 
[![Vardot](https://circleci.com/gh/Vardot/varbase/tree/9.1.x.svg?style=shield)](https://app.circleci.com/pipelines/github/Vardot/varbase?branch=9.1.x) Varbase 9.1.x

[![Vardot](https://circleci.com/gh/Vardot/varbase/tree/10.0.x.svg?style=shield)](https://app.circleci.com/pipelines/github/Vardot/varbase?branch=10.0.x) Varbase 10.0.x



[![](https://www.drupal.org/files/styles/grid-3/public/project-images/Medium-Logo%20Color%20with%20padding.png)](https://www.drupal.org/project/varbase)
@@ -19,8 +19,8 @@ in every project. 
* Comes with a lot of needed functionalities/modules for every-day Drupal site.

* [Tested, tested, and tested.](https://app.circleci.com/pipelines/github/Vardot/varbase)



Starting a new project? Consider Varbase for Drupal 9.

Installing Varbase 9.1.x comes with several extra automated installation

Starting a new project? Consider Varbase for Drupal 10.

Installing Varbase 10.0.x comes with several extra automated installation

steps, to take full advantage of Varbase, other than the Drupal 9 installation

instructions.
@@ -28,26 +28,26 @@ instructions. 
# Install with Composer





To install the dev version of Varbase 9.1.x run this command:

To install the dev version of Varbase 10.0.x run this command:

```

composer create-project vardot/varbase-project:9.1.x-dev PROJECT_DIR_NAME --stability dev --no-interaction

composer create-project vardot/varbase-project:10.0.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.1.x/scripts/README.md)

## [Create a new Vartheme sub theme for a project](https://github.com/Vardot/varbase/tree/10.0.x/scripts/README.md)



## [Automated Functional Testing](https://github.com/Vardot/varbase/blob/9.1.x/tests/README.md)

## [Automated Functional Testing](https://github.com/Vardot/varbase/blob/10.0.x/tests/README.md)



## [Varbase 9.1.x Developer Guide](https://docs.varbase.vardot.com)

## [Varbase 10.0.x Developer Guide](https://docs.varbase.vardot.com)



## [CHANGELOG for Varbase](https://github.com/Vardot/varbase/blob/9.1.x/CHANGELOG.md)

## [CHANGELOG for Varbase](https://github.com/Vardot/varbase/blob/10.0.x/CHANGELOG.md)



## [Varbase Gherkin features](https://github.com/Vardot/varbase/blob/9.1.x/tests/features/varbase/README.md)

## [Varbase Gherkin features](https://github.com/Vardot/varbase/blob/10.0.x/tests/features/varbase/README.md)



## [Varbase Developer Guide](https://docs.varbase.vardot.com)



## [CHANGELOG for Varbase](https://github.com/Vardot/varbase/blob/9.1.x/CHANGELOG.md)

## [CHANGELOG for Varbase](https://github.com/Vardot/varbase/blob/10.0.x/CHANGELOG.md)



## [General instructions on how to update Varbase](https://github.com/Vardot/varbase/blob/9.1.x/UPDATE.md)

## [General instructions on how to update Varbase](https://github.com/Vardot/varbase/blob/10.0.x/UPDATE.md)



## Local development with Lando

UPDATE.md

+2 −2
Original line number Diff line number Diff line
@@ -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.1.x/composer.json).

 [varbase-project](https://github.com/Vardot/varbase-project/blob/10.0.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.1.x/composer.json). 

 [varbase-project](https://github.com/Vardot/varbase-project/blob/10.0.x/composer.json). 

3. Back up your code and database 

4. Execute Composer update to download updates to modules and libraries.

 `composer update`

composer.json

+18 −20
Original line number Diff line number Diff line
@@ -31,26 +31,26 @@ 
    "oomphinc/composer-installers-extender": "~1.0 || ~2.0",

    "cweagans/composer-patches": "~1.0",

    "drupal/core-composer-scaffold": "^9",

    "drupal/core": "~9.0",

    "drupal/varbase_core": "9.1.x-dev",

    "drupal/varbase_api": "9.0.x-dev",

    "drupal/varbase_media": "9.1.x-dev",

    "drupal/varbase_editor": "9.1.x-dev",

    "drupal/varbase_landing": "9.1.x-dev",

    "drupal/core": "~9.0 || ~10",

    "drupal/varbase_core": "10.0.x-dev",

    "drupal/varbase_api": "10.0.x-dev",

    "drupal/varbase_media": "10.0.x-dev",

    "drupal/varbase_editor": "10.0.x-dev",

    "drupal/varbase_landing": "10.0.x-dev",

    "drupal/varbase_layout_builder": "10.1.x-dev",

    "drupal/varbase_bootstrap_paragraphs": "9.1.x-dev",

    "drupal/varbase_heroslider_media": "9.1.x-dev",

    "drupal/varbase_carousels": "9.1.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",

    "drupal/varbase_total_control": "9.0.x-dev",

    "drupal/varbase_styleguide": "9.1.x-dev",

    "drupal/varbase_email": "9.1.x-dev",

    "drupal/varbase_workflow": "2.0.x-dev",

    "drupal/varbase_bootstrap_paragraphs": "10.0.x-dev",

    "drupal/varbase_heroslider_media": "10.0.x-dev",

    "drupal/varbase_carousels": "10.0.x-dev",

    "drupal/varbase_blog": "10.0.x-dev",

    "drupal/varbase_search": "10.0.x-dev",

    "drupal/varbase_seo": "10.0.x-dev",

    "drupal/varbase_auth": "10.0.x-dev",

    "drupal/varbase_total_control": "10.0.x-dev",

    "drupal/varbase_styleguide": "10.0.x-dev",

    "drupal/varbase_email": "10.0.x-dev",

    "drupal/varbase_workflow": "3.0.x-dev",

    "drupal/vartheme_bs5": "1.0.x-dev",

    "drupal/vartheme_claro": "3.0.x-dev",

    "drupal/vartheme_claro": "4.0.x-dev",

    "vardot/entity-definition-update-manager": "~1.0",

    "vardot/module-installer-factory": "~1.0",

    "bower-asset/objectfitpolyfill": "~2.0",
@@ -113,8 +113,6 @@ 
      }

    },

    "branch-alias": {

      "dev-9.0.x": "9.0.x-dev",

      "dev-9.1.x": "9.1.x-dev",

      "dev-10.0.x": "10.0.x-dev"

    },

    "installer-types": [

tests/README.md

+2 −2
Original line number Diff line number Diff line
@@ -7,13 +7,13 @@ 
 This page list all the steps needed, which you need to run the

 Behat Gherkin Features to test a varbase website in your localhost machine.



To test varbase 9.1.x in the right way you will need to build varbase using

To test varbase 10.0.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.1.x-dev PROJECT_DIR_NAME --stability dev --no-interaction

composer create-project vardot/varbase:10.0.x-dev PROJECT_DIR_NAME --stability dev --no-interaction

```



### Add needed testing packages