From bbfee0e2b7d1b6865e8988b950d1c28a9bcadc61 Mon Sep 17 00:00:00 2001 From: Florent Vilmart Date: Sat, 3 Dec 2016 17:15:25 -0500 Subject: [PATCH 1/4] Revert "Deploy to docker hub on tags" --- .travis.yml | 8 -------- resources/docker-hub.sh | 3 --- 2 files changed, 11 deletions(-) delete mode 100644 resources/docker-hub.sh diff --git a/.travis.yml b/.travis.yml index 121e46d9b9..74500fa64f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,6 @@ node_js: services: - postgresql - redis-server - - docker addons: postgresql: '9.5' before_script: @@ -50,13 +49,6 @@ deploy: on: branch: master condition: "$BUILD_LEADER$BUILD_AGGREGATE_STATUS = YESothers_succeeded" - - provider: script - skip_cleanup: true - script: ./resources/docker-hub.sh - on: - tags: true - all_branches: true - condition: "$BUILD_LEADER$BUILD_AGGREGATE_STATUS = YESothers_succeeded" - provider: npm email: secure: T3LwSJFcu632SDfCoavcKL39NktWLEOOFzonAjeHAglmMyDp9hvU8xHwQ4JJy2CRA03c+ezAe2gH3Va+jfxvh1JtFUan+p88vaCHHKuNwPSp4WZBPt1ZTDmG+ACG6j+ZWHK+eP7hLvtlCi/M9/v4/bVojpm7v01LLiM+MRhnE9E7eLemQC4zb6RVtf2oGQ3mX51kMeya218kEm5bsQPpRJElI9jwletFa8qYK5AFgaCHpll059RRHQTTE9MTNcN58P/Kf6Qb3KGpKNoaHTXoOD4U6LcXLWvdHONVB6AzGefxg2b/dvtaO4nd5lDooMBR3u9kWpopXkyAuf+fO/8je9JTxO6CDUtDjHRcR2mCEXWX6rculIAbNXOv1ccRYCTQ8aFtYnFlMSb1+QIAdyT6HHmeT5ktk3+XJRuEv0PJJvqHTo+j7tPngjiv5sPNutgGFlOFO90omTbzEkIT/D/LsgXbWm2QKYWejbLiuSINg+FiFiZN90doCf4aCpm2y1Q/9GzvK+eXcpqzPCGxOykE7EuPZK3+S/ZU2oaWL2uSpbKPtC0qxebrneR307aVEa7C85HCkTMMBzE4tjUr8h5HhLqtWvqmDcnBo3PfQhf9cEO6jQLd3qhEVJmcwKz/yOCfgPXlCbRqiKk7j94perpNCIalXtMI9ySYjJNjHsB4600= diff --git a/resources/docker-hub.sh b/resources/docker-hub.sh deleted file mode 100644 index 9002c47c6b..0000000000 --- a/resources/docker-hub.sh +++ /dev/null @@ -1,3 +0,0 @@ -docker login -e="$DOCKER_EMAIL" -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD" -docker build -t parseplatform/parse-server:$TRAVIS_TAG . -docker push parseplatform/parse-server:$TRAVIS_TAG From 988fafd5384b205dab1d3db075c2b6ca8e90aeba Mon Sep 17 00:00:00 2001 From: Florent Vilmart Date: Sat, 3 Dec 2016 17:15:43 -0500 Subject: [PATCH 2/4] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 74500fa64f..0152c8920b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: node_js -dist: precise +dist: trusty sudo: false node_js: - '4.5' From 3330d345679977137e3b4d02bfd4cec498b315c2 Mon Sep 17 00:00:00 2001 From: Florent Vilmart Date: Sat, 3 Dec 2016 17:32:54 -0500 Subject: [PATCH 3/4] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0152c8920b..96240807de 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: node_js dist: trusty -sudo: false +sudo: required node_js: - '4.5' - '6.1' From c12ff63dcb1e8c9896df4557edc8cee980ec83fe Mon Sep 17 00:00:00 2001 From: Florent Vilmart Date: Sat, 3 Dec 2016 17:35:12 -0500 Subject: [PATCH 4/4] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 96240807de..4524e51934 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ services: - postgresql - redis-server addons: - postgresql: '9.5' + postgresql: '9.6' before_script: - ls -al "$HOME/.mongodb/versions" - psql -c 'create database parse_server_postgres_adapter_test_database;' -U postgres