Merge branch 'develop-v4' into enable-ocsp-stapling

Author: mbtamuli

.travis.yml

@@ -40,6 +40,7 @@ script:
   - ./ci/test-commands.sh
 
 after_script:
+  - cat /opt/easyengine/install.log
   - cat /opt/easyengine/ee.log
 
 jobs:

ci/prepare.sh

@@ -2,11 +2,12 @@
 
 # called by Travis CI
 
-if [[ "$TRAVIS_BRANCH" == "develop-v4" ]]; then
+if [[ "$TRAVIS_BRANCH" != $DEPLOY_BRANCH ]]; then
     version=$(head -n 1 VERSION)
     version="$(echo $version | xargs)"
-    version+="-nightly"
+    version+="-nightly-$(git rev-parse --short HEAD)"
     echo $version > VERSION
+    sed -i 's/\:\ \"\(.*\)\"/\:\ \"\1-nightly\"/g' img-versions.json
 fi
 
 php -dphar.readonly=0 ./utils/make-phar.php easyengine.phar --quiet

ci/test-env-install.sh

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 function setup_test_requirements() {
+    readonly LOG_FILE="/opt/easyengine/install.log"
     # Adding software-properties-common for add-apt-repository.
     apt-get install -y software-properties-common
     # Adding ondrej/php repository for installing php, this works for all ubuntu flavours.