Fix ordering of tagging and compiling in release script

diff --git a/tools/cross-compile.sh b/tools/cross-compile.sh
index 06329d9ae9001e22c0e9ba98536edd013ec0fef4..d0b962c3d64c9a476164e57a5faf9955189d66c6 100755 (executable)
--- a/tools/cross-compile.sh
+++ b/tools/cross-compile.sh
@@ -1,13 +1,13 @@
 # Source tar
 
-# ./vendor-src.sh micro-$1-src
+./vendor-src.sh micro-$1-src
 cd ..
 
 mkdir -p binaries
 mkdir -p micro-$1
 
-# mv micro-$1-src.tar.gz binaries
-# mv micro-$1-src.zip binaries
+mv micro-$1-src.tar.gz binaries
+mv micro-$1-src.zip binaries
 
 cp LICENSE micro-$1
 cp README.md micro-$1

diff --git a/tools/nightly-release.sh b/tools/nightly-release.sh
index 8e5e9b91632852983a68b1b02ac1b2660b3c6d34..e5360756be7fcdaeb862e60caee62d0c8058d855 100755 (executable)
--- a/tools/nightly-release.sh
+++ b/tools/nightly-release.sh
@@ -1,5 +1,4 @@
 # This script creates the nightly release on Github for micro
-# It assumes that the binaries are in the current directory
 # You must have the correct Github access token to run this script
 
 echo "Deleting old release"
@@ -23,6 +22,10 @@ github-release release \
     --description "Autogenerated nightly build of micro" \
     --pre-release
 
+echo "Cross compiling binaries"
+./cross-compile.sh $1
+mv ../binaries .
+
 echo "Uploading OSX binary"
 github-release upload \
     --user zyedidia \
@@ -119,18 +122,18 @@ github-release upload \
     --name "micro-$1-win32.zip" \
     --file binaries/micro-$1-win32.zip
 
-# echo "Uploading vendored tarball"
-# github-release upload \
-#     --user zyedidia \
-#     --repo micro \
-#     --tag nightly \
-#     --name "micro-$1-src.tar.gz" \
-#     --file binaries/micro-$1-src.tar.gz
-#
-# echo "Uploading vendored zip"
-# github-release upload \
-#     --user zyedidia \
-#     --repo micro \
-#     --tag nightly \
-#     --name "micro-$1-src.zip" \
-#     --file binaries/micro-$1-src.zip
+echo "Uploading vendored tarball"
+github-release upload \
+    --user zyedidia \
+    --repo micro \
+    --tag nightly \
+    --name "micro-$1-src.tar.gz" \
+    --file binaries/micro-$1-src.tar.gz
+
+echo "Uploading vendored zip"
+github-release upload \
+    --user zyedidia \
+    --repo micro \
+    --tag nightly \
+    --name "micro-$1-src.zip" \
+    --file binaries/micro-$1-src.zip

diff --git a/tools/pre-release.sh b/tools/pre-release.sh
index 5861a093d41a079368d335141505628e45ed0689..a7219b280d6228e61745875e4e41d38824656897 100755 (executable)
--- a/tools/pre-release.sh
+++ b/tools/pre-release.sh
@@ -1,5 +1,4 @@
 # This script creates releases on Github for micro
-# It assumes that the binaries are in the current directory
 # You must have the correct Github access token to run this script
 
 # $1 is the title, $2 is the description
@@ -20,6 +19,10 @@ github-release release \
     --description "$2" \
     --pre-release
 
+echo "Cross compiling binaries"
+./cross-compile.sh $1
+mv ../binaries .
+
 echo "Uploading OSX binary"
 github-release upload \
     --user zyedidia \
@@ -116,18 +119,18 @@ github-release upload \
     --name "micro-$1-win32.zip" \
     --file binaries/micro-$1-win32.zip
 
-# echo "Uploading vendored tarball"
-# github-release upload \
-#     --user zyedidia \
-#     --repo micro \
-#     --tag $tag \
-#     --name "micro-$1-src.tar.gz" \
-#     --file binaries/micro-$1-src.tar.gz
-#
-# echo "Uploading vendored zip"
-# github-release upload \
-#     --user zyedidia \
-#     --repo micro \
-#     --tag $tag \
-#     --name "micro-$1-src.zip" \
-#     --file binaries/micro-$1-src.zip
+echo "Uploading vendored tarball"
+github-release upload \
+    --user zyedidia \
+    --repo micro \
+    --tag $tag \
+    --name "micro-$1-src.tar.gz" \
+    --file binaries/micro-$1-src.tar.gz
+
+echo "Uploading vendored zip"
+github-release upload \
+    --user zyedidia \
+    --repo micro \
+    --tag $tag \
+    --name "micro-$1-src.zip" \
+    --file binaries/micro-$1-src.zip

diff --git a/tools/release.sh b/tools/release.sh
index 81b5b5898309f0fb807beb04a3c1980bd0bed86b..8f39ef6b5e2cff5381ca31a044dd6d2176c2aa2f 100755 (executable)
--- a/tools/release.sh
+++ b/tools/release.sh
@@ -1,5 +1,4 @@
 # This script creates releases on Github for micro
-# It assumes that the binaries are in the current directory
 # You must have the correct Github access token to run this script
 
 # $1 is the title, $2 is the description
@@ -19,6 +18,10 @@ github-release release \
     --name "$1" \
     --description "$2" \
 
+echo "Cross compiling binaries"
+./cross-compile.sh $1
+mv ../binaries .
+
 echo "Uploading OSX binary"
 github-release upload \
     --user zyedidia \
@@ -115,19 +118,19 @@ github-release upload \
     --name "micro-$1-win32.zip" \
     --file binaries/micro-$1-win32.zip
 
-# echo "Uploading vendored tarball"
-# github-release upload \
-#     --user zyedidia \
-#     --repo micro \
-#     --tag $tag \
-#     --name "micro-$1-src.tar.gz" \
-#     --file binaries/micro-$1-src.tar.gz
-#
-# echo "Uploading vendored zip"
-#
-# github-release upload \
-#     --user zyedidia \
-#     --repo micro \
-#     --tag $tag \
-#     --name "micro-$1-src.zip" \
-#     --file binaries/micro-$1-src.zip
+echo "Uploading vendored tarball"
+github-release upload \
+    --user zyedidia \
+    --repo micro \
+    --tag $tag \
+    --name "micro-$1-src.tar.gz" \
+    --file binaries/micro-$1-src.tar.gz
+
+echo "Uploading vendored zip"
+
+github-release upload \
+    --user zyedidia \
+    --repo micro \
+    --tag $tag \
+    --name "micro-$1-src.zip" \
+    --file binaries/micro-$1-src.zip

diff --git a/tools/vendor-src.sh b/tools/vendor-src.sh
index fc491231647eed05c4513c7da3536c80a003b47b..e7bc0a1804856284278eacf383474c6a10c6008f 100755 (executable)
--- a/tools/vendor-src.sh
+++ b/tools/vendor-src.sh
@@ -1,9 +1,4 @@
-cd ../cmd/micro
-
-govendor init
-govendor add +e
-
-cd ../../..
+cd ../..
 
 tar czf "$1".tar.gz micro
 zip -rq "$1".zip micro