diff --git a/github.sh b/github.sh index bdbe3573e130d3f9a74682ab4aff0d5a9d8d1842..3de08cbbc07028ce1d00bc13823d983e1a783fe7 100755 --- a/github.sh +++ b/github.sh @@ -48,14 +48,18 @@ case "$1" in echo "Creating new release..." result=`curl -i https://api.github.com/repos/duniter/cesium/releases -u $2 -d '{"tag_name": "v'"$current"'","target_commitish": "master","name": "'"$current"'","body": "'"$3"'","draft": false,"prerelease": '"$prerelease"'}'` - upload_url=`echo "$result" | grep -P "upload_url\": \"[^\"]+" | grep -oP "https://[a-z0-9/.]+"` - echo $upload_url + upload_url=`echo "$result" | grep -P "\"upload_url\": \"[^\"]+" | grep -oP "https://[a-z0-9/.]+"` ### Sending files - echo "Sending binaries..." - curl -i ''"$upload_url"'?name=cesium-v'"$current"'-web.zip' -u $2 -H 'Content-Type: application/zip' --data '@platforms/web/build/cesium-web-'"$current"'.zip' - curl -i ''"$upload_url"'?name=cesium-v'"$current"'-firefoxos.zip' -u $2 -H 'Content-Type: application/zip' --data '@platforms/firefoxos/build/package.zip' - curl -i ''"$upload_url"'?name=cesium-v'"$current"'-android.apk' -u $2 -H 'Content-Type: application/vnd.android.package-archive' --data '@platforms/android/build/outputs/apk/android-release.apk' + echo "Uploading files to GitHub..." + dirname=`pwd` + curl -i -u $2 -H 'Content-Type: application/zip' -T $dirname/platforms/web/build/cesium-web-$current.zip $upload_url?name=cesium-v$current-web.zip + curl -i -u $2 -H 'Content-Type: application/zip' -T $dirname/platforms/firefoxos/build/package.zip $upload_url?name=cesium-v$current-firefoxos.zip + curl -i -u $2 -H 'Content-Type: application/vnd.android.package-archive' -T $dirname/platforms/android/build/outputs/apk/android-release.apk $upload_url?name=cesium-v$current-android.zip + + echo "Successfully uploading files" + release_url=`echo "$result" | grep -P "\"url\": \"[^\"]+" | grep -oP "https://api.github.com/repos/[a-z0-9/.]+"` + echo " Release address: $release_url" else echo "Wrong arguments" echo "Usage:" diff --git a/release.sh b/release.sh index 90a7b1b21fb4ca27ead3fe510f57cec513132651..0e7660f4d9cc2b4a8d1b824e7a49f0aec34ed016 100755 --- a/release.sh +++ b/release.sh @@ -43,6 +43,12 @@ if [[ $2 =~ ^[0-9]+.[0-9]+.[0-9]+((a|b)[0-9]+)?$ && $3 =~ ^[0-9]+$ ]]; then git commit -m "v$2" git tag "v$2" git push + + # Build assets + gulp default --env default + ionic build android --release + ionic build firefoxos --release + gulp build:web --release else echo "Wrong version format" echo "Usage:" @@ -52,13 +58,7 @@ else echo " - android-version: nnn" fi -gulp default --env default - -ionic build android --release - -ionic build firefoxos --release -gulp build:web --release diff --git a/www/js/config.js b/www/js/config.js index 620eeb5eabf11505d9eb50b0907909a3e8633c68..8cb62bf58c4a40ddfe9747cb4204a43c9a7f382a 100644 --- a/www/js/config.js +++ b/www/js/config.js @@ -28,8 +28,8 @@ angular.module("cesium.config", []) "port": "9203" } }, - "version": "0.2.4", - "build": "2016-08-23T09:43:41.411Z", + "version": "0.2.5", + "build": "2016-08-23T11:23:56.892Z", "newIssueUrl": "https://github.com/duniter/cesium/issues/new?labels=bug" })