Merge branch 'testing'

2017-01-02 11:32:37 +01:00 · 2017-01-02 11:32:37 +01:00 · 7ac0983229
parent ef90fea506 a418d1bb5d
commit 7ac0983229
2 changed files with 8 additions and 2 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -20,5 +20,6 @@ env:
    DIRECTOR_TESTDB_USER="director_test"

 before_script:
+  - composer self-update --stable
  - ./test/travis-prepare.sh
  - composer install
--- a/composer.json
+++ b/composer.json
@ -15,10 +15,15 @@
      "type": "package",
      "package": {
        "name": "icinga/icingaweb2",
-        "version": "2.3.4",
+        "version": "2.4.0",
        "dist": {
-          "url": "https://github.com/Icinga/icingaweb2/archive/v2.3.4.zip",
+          "url": "https://github.com/Icinga/icingaweb2/archive/v2.4.0.zip",
          "type": "zip"
+        },
+        "source": {
+          "url": "https://github.com/Icinga/icingaweb2.git",
+          "type": "git",
+          "reference": "master"
        }
      }
    }