diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-01-08 12:05:42 -0500 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-01-21 09:31:05 -0500 |
| commit | c320bb4565231cd11ffd70851766059c867058da (patch) | |
| tree | a447e41dfb4c5dce63b7b9a5a6472d0ccb3e266b | |
| parent | 5e9dde6a4cdec89bbc234830c7bd17a717f29baf (diff) | |
| download | chat-c320bb4565231cd11ffd70851766059c867058da.tar.gz chat-c320bb4565231cd11ffd70851766059c867058da.tar.bz2 chat-c320bb4565231cd11ffd70851766059c867058da.zip | |
Adding curl to upload pr builds
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | Makefile | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index c88267206..47986dd2e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,8 @@ script: make dist-travis addons: hosts: - 127.0.0.1 dockerhost +after_success: + - cd dist && curl -F "pr_number=$TRAVIS_PULL_REQUEST" -F "file=@mattermost.tar.gz" mattermod.mattermost.com:8087/upload_pr_build before_deploy: - sudo rm -rf dist/mattermost - sudo chown `whoami` dist/mattermost.tar.gz @@ -146,6 +146,8 @@ package: sed -i'.bak' 's|libs.min.js|libs-$(BUILD_NUMBER).min.js|g' $(DIST_PATH)/web/templates/head.html rm $(DIST_PATH)/web/templates/*.bak + mv $(DIST_PATH)/config/config.json.bak $(DIST_PATH)/config/config.json + tar -C dist -czf $(DIST_PATH).tar.gz mattermost build-client: @@ -179,7 +181,7 @@ travis-init: if [ "$(TRAVIS_DB)" = "postgres" ]; then \ sed -i'.bak' 's|mysql|postgres|g' config/config.json; \ - sed -i'.bak' 's|mmuser:mostest@tcp(dockerhost:3306)/mattermost_test?charset=utf8mb4,utf8|postgres://mmuser:mostest@postgres:5432/mattermost_test?sslmode=disable\&connect_timeout=10|g' config/config.json; \ + sed -i'.bak2' 's|mmuser:mostest@tcp(dockerhost:3306)/mattermost_test?charset=utf8mb4,utf8|postgres://mmuser:mostest@postgres:5432/mattermost_test?sslmode=disable\&connect_timeout=10|g' config/config.json; \ fi if [ "$(TRAVIS_DB)" = "mysql" ]; then \ |