From d76ee6a182d18d6e8ebd6b7cb82ff572f202445a Mon Sep 17 00:00:00 2001 From: Florian Weber Date: Tue, 30 Aug 2016 13:55:18 +0200 Subject: [PATCH 1/4] Test #189 --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 069f1a6288..96ad4d7f2e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,13 +11,14 @@ env: - SIMPLETEST_DB=sqlite://tmp/site.sqlite - SIMPLETEST_BASE_URL="http://127.0.0.1:8080" matrix: - - RELEASE=stable - - RELEASE=dev + - RELEASE=stable,COMPOSER_CHANNEL=stable + - RELEASE=dev,COMPOSER_CHANNEL=stable + - RELEASE=stable,COMPOSER_CHANNEL=snapshot before_install: - echo 'sendmail_path = /bin/true' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini - phpenv config-rm xdebug.ini - - composer --verbose self-update + - composer --verbose self-update --$COMPOSER_CHANNEL - composer --version install: From 6066fc222a6f4d3f64789d554db7971c3ec7702c Mon Sep 17 00:00:00 2001 From: Florian Weber Date: Tue, 30 Aug 2016 15:12:41 +0200 Subject: [PATCH 2/4] Update .travis.yml --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 96ad4d7f2e..defcabf7e9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,9 +11,9 @@ env: - SIMPLETEST_DB=sqlite://tmp/site.sqlite - SIMPLETEST_BASE_URL="http://127.0.0.1:8080" matrix: - - RELEASE=stable,COMPOSER_CHANNEL=stable - - RELEASE=dev,COMPOSER_CHANNEL=stable - - RELEASE=stable,COMPOSER_CHANNEL=snapshot + - RELEASE=stable COMPOSER_CHANNEL=stable + - RELEASE=dev COMPOSER_CHANNEL=stable + - RELEASE=stable COMPOSER_CHANNEL=snapshot before_install: - echo 'sendmail_path = /bin/true' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini From 37ab405265a566fee9fe6c20b26dc212f7f8ae6c Mon Sep 17 00:00:00 2001 From: Florian Weber Date: Tue, 30 Aug 2016 23:03:39 +0200 Subject: [PATCH 3/4] Fix --- .travis.yml | 1 + scripts/composer/ScriptHandler.php | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index defcabf7e9..dde56d01f7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,6 +32,7 @@ script: - ./../vendor/bin/drush runserver http://127.0.0.1:8080 & - sleep 3 # Skip core/tests/Drupal/Tests/ComposerIntegrationTest.php because web/ has no composer.json + # Ignore PageCache group temporarily, @see https://www.drupal.org/node/2770673 - ./../vendor/bin/phpunit -c core --testsuite unit --exclude-group Composer - ./../vendor/bin/drush - ./../vendor/bin/drupal diff --git a/scripts/composer/ScriptHandler.php b/scripts/composer/ScriptHandler.php index aa0e91ccb2..02d0f96f02 100644 --- a/scripts/composer/ScriptHandler.php +++ b/scripts/composer/ScriptHandler.php @@ -78,9 +78,15 @@ public static function checkComposerVersion(Event $event) { $version = $composer::VERSION; + // The dev-channel of composer uses the git revision as version number, + // try to the branch alias instead. + if (preg_match('/^[0-9a-f]{40}$/i', $version)) { + $version = $composer::BRANCH_ALIAS_VERSION; + } + // If Composer is installed through git we have no easy way to determine if // it is new enough, just display a warning. - if ($version === '@package_version@') { + if ($version === '@package_version@' || $version === '@package_branch_alias_version@') { $io->writeError('You are running a development version of Composer. If you experience problems, please update Composer to the latest stable version.'); } elseif (Comparator::lessThan($version, '1.0.0')) { From fa2377d10b8d2f5b3c0b8b080032bbbf43eca2b9 Mon Sep 17 00:00:00 2001 From: Florian Weber Date: Tue, 30 Aug 2016 23:04:36 +0200 Subject: [PATCH 4/4] Fix --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index dde56d01f7..23d89b6f17 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,6 +33,6 @@ script: - sleep 3 # Skip core/tests/Drupal/Tests/ComposerIntegrationTest.php because web/ has no composer.json # Ignore PageCache group temporarily, @see https://www.drupal.org/node/2770673 - - ./../vendor/bin/phpunit -c core --testsuite unit --exclude-group Composer + - ./../vendor/bin/phpunit -c core --testsuite unit --exclude-group Composer,PageCache - ./../vendor/bin/drush - ./../vendor/bin/drupal