[BUGFIX] Update branch alias for composer version 78/52478/7
authorBenni Mack <benni@typo3.org>
Tue, 18 Apr 2017 11:50:39 +0000 (13:50 +0200)
committerChristian Kuhn <lolli@schwarzbu.ch>
Tue, 18 Apr 2017 16:17:10 +0000 (18:17 +0200)
After branching it must be clear that 9.x is the latest development
branch where 8.x is mapped to TYPO3_8-7.

Additionally for the testing framework, composer needs to know
TYPO3_8-7 is handled as a version branch and not a feature branch.

Resolves: #80877
Releases: 8.7
Change-Id: I59857537167e552be786af1ef9756226d8e468b6
Reviewed-on: https://review.typo3.org/52478
Reviewed-by: Helmut Hummel <typo3@helhum.io>
Tested-by: Helmut Hummel <typo3@helhum.io>
Reviewed-by: Oliver Hader <oliver.hader@typo3.org>
Tested-by: TYPO3com <no-reply@typo3.com>
Tested-by: Oliver Hader <oliver.hader@typo3.org>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
.travis.yml
composer.json
composer.lock

index c1098d3..9ac2961 100644 (file)
@@ -48,7 +48,7 @@ before_script:
   - phpenv config-rm xdebug.ini
   - echo "extension = memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
   - echo "extension = redis.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
-  - composer install
+  - COMPOSER_ROOT_VERSION=8.7.0 composer install
   - export typo3DatabaseName="typo3"
   - export typo3DatabaseHost="localhost"
   - export typo3DatabaseUsername="root"
index 7b747db..0692be6 100644 (file)
                        ]
                },
                "branch-alias": {
-                       "dev-master": "8.x-dev"
+                       "dev-TYPO3_8-7": "8.x-dev"
                }
        },
+       "non-feature-branches": [
+               "TYPO3_.+"
+       ],
        "replace": {
                "typo3/cms-about": "self.version",
                "typo3/cms-backend": "self.version",
index 29f5365..8e8cca3 100644 (file)
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "bbc35746c3ff38592cd496cb7dd4736b",
+    "content-hash": "d466da27236cd52e943ba1e2f894f070",
     "packages": [
         {
             "name": "cogpowered/finediff",