diff --git a/github.sh b/github.sh new file mode 100755 index 0000000000000000000000000000000000000000..bdbe3573e130d3f9a74682ab4aff0d5a9d8d1842 --- /dev/null +++ b/github.sh @@ -0,0 +1,76 @@ +#!/bin/bash + +### Control that the script is run on `dev` branch +branch=`git rev-parse --abbrev-ref HEAD` +if [[ ! "$branch" = "master" ]]; +then + echo ">> This script must be run under \`master\` branch" + exit +fi + + +### Releasing +current=`grep -P "version\": \"\d+.\d+.\d+(\w*)" package.json | grep -oP "\d+.\d+.\d+(\w*)"` +echo "Current version: $current" + +case "$1" in + del) + if [[ $2 =~ ^[a-zA-Z0-9_]+:[a-zA-Z0-9_]+$ ]]; then + result=`curl -i 'https://api.github.com/repos/duniter/cesium/releases/tags/v'"$current"''` + release_url=`echo "$result" | grep -P "\"url\": \"[^\"]+" | grep -oP "https://api.github.com/repos/duniter/cesium/releases/\d+"` + if [[ $release_url != "" ]]; then + echo "Deleting existing release..." + curl -XDELETE $release_url -u $2 + fi + else + echo "Wrong argument" + echo "Usage:" + echo " > ./github.sh del user:password" + exit + fi + ;; + + pre|rel) + if [[ $2 =~ ^[a-zA-Z0-9_]+:[a-zA-Z0-9_]+$ && $3 != "" ]]; then + + if [[ $1 = "pre" ]]; then + prerelease="true" + else + prerelease="false" + fi + + result=`curl -i 'https://api.github.com/repos/duniter/cesium/releases/tags/v'"$current"''` + release_url=`echo "$result" | grep -P "\"url\": \"[^\"]+" | grep -oP "https://api.github.com/repos/duniter/cesium/releases/\d+"` + if [[ $release_url != "" ]]; then + echo "Deleting existing release..." + curl -XDELETE $release_url -u $2 + fi + + 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 + + ### 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' + else + echo "Wrong arguments" + echo "Usage:" + echo " > ./github.sh pre|rel user:password <release_description>" + echo "With:" + echo " - pre: use for pre-release" + echo " - rel: for full release" + exit + fi + ;; + *) + echo "No task given" + ;; +esac + + + + diff --git a/release.sh b/release.sh index 9052f7016d38dbf5f2431ba397a4e9f3c065d3e4..90a7b1b21fb4ca27ead3fe510f57cec513132651 100755 --- a/release.sh +++ b/release.sh @@ -16,7 +16,8 @@ currentAndroid=`grep -P "android-versionCode=\"\d+\"" config.xml | grep -oP "\d+ echo "Current Android version: $currentAndroid" if [[ $2 =~ ^[0-9]+.[0-9]+.[0-9]+((a|b)[0-9]+)?$ && $3 =~ ^[0-9]+$ ]]; then - echo "build $2" + echo "new build version: $2" + echo "new build android version: $3" case "$1" in rel|pre) # Change the version in package.json and test file @@ -41,10 +42,11 @@ if [[ $2 =~ ^[0-9]+.[0-9]+.[0-9]+((a|b)[0-9]+)?$ && $3 =~ ^[0-9]+$ ]]; then esac git commit -m "v$2" git tag "v$2" + git push else echo "Wrong version format" echo "Usage:" - echo " > release.sh [pre|rel] <version> <android-version>" + echo " > ./release.sh [pre|rel] <version> <android-version>" echo "with:" echo " - version: x.y.z" echo " - android-version: nnn" @@ -62,3 +64,4 @@ gulp build:web --release + diff --git a/www/js/config.js b/www/js/config.js index 65aae5932fd2125cec62b2f5c103cebd02bc445a..620eeb5eabf11505d9eb50b0907909a3e8633c68 100644 --- a/www/js/config.js +++ b/www/js/config.js @@ -28,8 +28,8 @@ angular.module("cesium.config", []) "port": "9203" } }, - "version": "0.2.3", - "build": "2016-08-23T09:25:41.250Z", + "version": "0.2.4", + "build": "2016-08-23T09:43:41.411Z", "newIssueUrl": "https://github.com/duniter/cesium/issues/new?labels=bug" })