Merge remote-tracking branch 'upstream/feature/github_releases' into feature/version-check

Samuel Nitsche · Samuel Nitsche · commit 7af404cc023c · 2017-11-15T16:47:23.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -39,9 +39,15 @@ before_deploy:
   - bash .travis/create_release.sh
 
 deploy:
-  provider: bintray
-  file: bintray.json
-  user: $BINTRAY_USER
-  key: $BINTRAY_API_KEY
-  dry-run: false
-  on: develop
+  - provider: releases
+    api_key: $GITHUB_API_TOKEN
+    file: utPLSQL-cli.zip
+    skip_cleanup: true
+    on:
+      tags: true
+  - provider: bintray
+    file: bintray.json
+    user: $BINTRAY_USER
+    key: $BINTRAY_API_KEY
+    dry-run: false
+    on: develop
diff --git a/.travis/create_release.sh b/.travis/create_release.sh
@@ -6,6 +6,7 @@ VERSION=`date +%Y%m%d%H%M`
 mkdir dist
 mv target/appassembler utPLSQL-cli
 zip -r -q dist/utPLSQL-cli-${TRAVIS_BRANCH}-${VERSION}.zip utPLSQL-cli
+zip -r -q utPLSQL-cli.zip utPLSQL-cli
 
 cat > bintray.json <<EOF
 {

Original file line number	Diff line number	Diff line change
@@ -6,6 +6,7 @@ VERSION=`date +%Y%m%d%H%M`
`6`	`6`	`mkdir dist`
`7`	`7`	`mv target/appassembler utPLSQL-cli`
`8`	`8`	`zip -r -q dist/utPLSQL-cli-${TRAVIS_BRANCH}-${VERSION}.zip utPLSQL-cli`
	`9`	`+zip -r -q utPLSQL-cli.zip utPLSQL-cli`
`9`	`10`
`10`	`11`	`cat > bintray.json <<EOF`
`11`	`12`	`{`