0.5.3

genkgo · Jan 16, 2016 · 0f16f76 · 0f16f76
1 parent a295978
commit 0f16f76
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,10 +8,10 @@
 *.exe
 
 # Generated by Cargo
-/daemon/target/
+/target/
 
 # IDE
 /.idea
 
 # Cargo overrides
-/.cargo
+/.cargo
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "gworkerd"
-version = "0.5.0"
+version = "0.5.3"
 authors = [ "Frederik Bosch <[email protected]>" ]
 
 [dependencies]

diff --git a/assets/config/example.json b/assets/config/example.json
@@ -21,7 +21,7 @@
     },
     "monitor": {
         "address": "localhost:3000",
-        "webapp_path": "../webapp/dist",
+        "webapp_path": "monitor/dist",
         "websockets": false,
         "password": "test"
     }

diff --git a/monitor b/monitor
diff --git a/release.sh b/release.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+if [ -z "$1" ]; then
+    echo "You forgot the version number"
+    exit 1
+fi
+
+# make sure we are in the right directory
+cd "$(dirname "$0")"
+
+# update monitor submodule to latest commit
+git submodule update --remote --merge
+
+# install monitor dependencies and build monitor
+cd monitor && npm install && bower install && ember build --environment=production && cd ..
+
+# modify version number in cargo toml
+version_toml="version = \"$1\""
+sed -i "s/version\(.*\)/$version_toml/" Cargo.toml
+
+# build daemon
+cargo build --release
+
+# commit current version
+git commit -a -m $1 && git push && git tag $1 && git push --tags
+
+# tar gz daemon and monitor
+tar --transform "s|monitor/dist|monitor|" \
+    --transform "s|target/release/gworkerd|gworkerd|" \
+    -cvzf release/gworkerd.$1.tar.gz \
+    target/release/gworkerd \
+    monitor/dist
diff --git a/release/.gitignore b/release/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore