Prepare 1.2 release (#29)

* Update composer.json
* Update Jenkinsfile
* Update .travis.yml

Author: jmleroux

.travis.yml

@@ -3,7 +3,6 @@ sudo: false
 
 php:
     - 5.6
-    - 7.0
     - 7.1
 
 matrix:
@@ -15,9 +14,7 @@ cache:
         - $HOME/.composer/cache/files
 
 before_install:
-    - if [ "$TRAVIS_PHP_VERSION" != "7.1" ]; then
-        phpenv config-rm xdebug.ini;
-      fi;
+    - phpenv config-rm xdebug.ini || echo "xdebug not available for PHP $TRAVIS_PHP_VERSION"
     - echo "memory_limit=3G" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
     - echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
 

Jenkinsfile

@@ -5,7 +5,11 @@ def mysqlVersion = "5.5"
 def launchUnitTests = "yes"
 def launchIntegrationTests = "yes"
 def launchBehatTests = "yes"
-def commit = "${env.GIT_COMMIT}"
+
+class Globals {
+    static pimVersion = "1.7"
+    static extensionBranch = "dev-master"
+}
 
 stage("Checkout") {
     milestone 1
@@ -26,13 +30,13 @@ stage("Checkout") {
         stash "excel_init"
 
         checkout([$class: 'GitSCM',
-             branches: [[name: '1.7']],
+             branches: [[name: "${Globals.pimVersion}"]],
              userRemoteConfigs: [[credentialsId: 'github-credentials', url: 'https://github.com/akeneo/pim-community-standard.git']]
         ])
         stash "pim_community"
 
        checkout([$class: 'GitSCM',
-         branches: [[name: '1.7']],
+         branches: [[name: "${Globals.pimVersion}"]],
          userRemoteConfigs: [[credentialsId: 'github-credentials', url: 'https://github.com/akeneo/pim-enterprise-standard.git']]
        ])
        stash "pim_enterprise"
@@ -44,11 +48,9 @@ if (launchUnitTests.equals("yes")) {
         def tasks = [:]
 
         tasks["phpspec-5.6"] = {runPhpSpecTest("5.6")}
-        tasks["phpspec-7.0"] = {runPhpSpecTest("7.0")}
         tasks["phpspec-7.1"] = {runPhpSpecTest("7.1")}
 
         tasks["php-cs-fixer-5.6"] = {runPhpCsFixerTest("5.6")}
-        tasks["php-cs-fixer-7.0"] = {runPhpCsFixerTest("7.0")}
         tasks["php-cs-fixer-7.1"] = {runPhpCsFixerTest("7.1")}
 
         parallel tasks
@@ -60,10 +62,10 @@ if (launchIntegrationTests.equals("yes")) {
         def tasks = [:]
 
         tasks["phpunit-5.6-ce"] = {runIntegrationTest("5.6")}
-        tasks["phpunit-7.0-ce"] = {runIntegrationTest("7.0")}
+        tasks["phpunit-7.1-ce"] = {runIntegrationTest("7.1")}
 
         tasks["phpunit-5.6-ee"] = {runIntegrationTestEE("5.6")}
-        tasks["phpunit-7.0-ee"] = {runIntegrationTestEE("7.0")}
+        tasks["phpunit-7.1-ee"] = {runIntegrationTestEE("7.1")}
 
         parallel tasks
     }
@@ -118,10 +120,11 @@ def runIntegrationTest(version) {
                     sh "composer require --no-update alcaeus/mongo-php-adapter"
                 }
 
-                sh "composer require --no-update phpunit/phpunit akeneo/excel-init-bundle"
+                sh "composer require --no-update phpunit/phpunit akeneo/excel-init-bundle:${Globals.extensionBranch}"
                 sh "composer update --ignore-platform-reqs --optimize-autoloader --no-interaction --no-progress --prefer-dist"
 
                 dir("vendor/akeneo/excel-init-bundle") {
+                    deleteDir()
                     unstash "excel_init"
                 }
                 sh "composer dump-autoload -o"
@@ -149,7 +152,7 @@ def runIntegrationTestEE(version) {
                     sh "composer require --no-update alcaeus/mongo-php-adapter"
                 }
 
-                sh "composer require --no-update phpunit/phpunit akeneo/excel-init-bundle"
+                sh "composer require --no-update phpunit/phpunit akeneo/excel-init-bundle:${Globals.extensionBranch}"
                 sh "composer update --ignore-platform-reqs --optimize-autoloader --no-interaction --no-progress --prefer-dist"
 
                 dir("vendor/akeneo/excel-init-bundle") {

composer.json

@@ -19,25 +19,17 @@
         }
     ],
     "require": {
-        "akeneo/pim-community-dev": "1.7.*@beta"
+        "akeneo/pim-community-dev": "1.7.*"
     },
     "require-dev": {
         "phpspec/phpspec": "@stable",
-        "friendsofphp/php-cs-fixer": "@stable",
-        "squizlabs/php_codesniffer": "2.3.*",
-        "phpmd/phpmd": "2.3.*",
-        "henrikbjorn/phpspec-code-coverage": "3.0.1"
+        "friendsofphp/php-cs-fixer": "@stable"
     },
     "config": {
         "bin-dir": "bin"
     },
     "autoload": {
         "psr-4": { "Pim\\Bundle\\ExcelInitBundle\\": "src/" }
     },
-    "minimum-stability": "stable",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.0.x-dev"
-        }
-    }
+    "minimum-stability": "stable"
 }