Merge pull request #4 from oarrabi/oarrabi/local-release

Oarrabi/local release

Author: nsomar

.gitignore

@@ -195,4 +195,5 @@ guaka-cli.xcodeproj
 Packages/
 
 ### Objective-C Patch ###
+.DS_STORE
 0

Makefile

@@ -22,9 +22,11 @@ generate:
 
 clean-darwin:
 	rm -rf bin/darwin
+	rm -rf release/darwin
 
 clean-linux:
 	rm -rf bin/linux
+	rm -rf release/linux
 
 clean:
 	rm -rf .build
@@ -38,6 +40,7 @@ build-project-darwin:
 	mkdir -p bin/darwin
 	make build-project
 	cp ./.build/debug/guaka-cli bin/darwin/guaka
+	@echo "\nDarwin version built at bin/darwin/guaka\n"
 
 build-project-linux:
 	mkdir -p bin/linux
@@ -47,15 +50,49 @@ build-project-linux:
 release-darwin:
 	bash scripts/release-darwin.sh
 
+release-darwin-local:
+	rm -rf .build
+	make build-project-darwin
+	bash scripts/release-darwin.sh
+
 release-linux:
 	bash scripts/release-linux.sh
 
-publish-homebrew-mac:
+release-linux-local:
+	rm -rf .build
+	make clean-linux
+	make build-project-linux
+
+publish-local-darwin:
 	bash scripts/publish-homebrew-mac.sh
 
-release-and-deploy-darwin:
-	make release-darwin
-	make publish-homebrew-mac
+build-linux-docker:
+	@echo "Runs release-linux-local inside a docker image"
+	@echo "The built file is located at bin/linux/guaka"
+	docker-compose run -w /work swift
+	@echo "\nLinux version built at bin/linux/guaka\n"
+
+build-all-local: clean build-linux-docker build-project-darwin
+	@echo "Binaries built at bin/\n"
+
+release-local:
+	make build-all-local
+	@echo "Starting the github release for version ${VERSION}/\n"
+	bash scripts/github-release.sh
+
+	@echo "Upload darwin binary\n"
+	bash scripts/release-darwin.sh
+
+	@echo "Upload linux binary\n"
+	bash scripts/release-linux.sh
+
+publish-local:
+	make publish-local-darwin
+
+release-publish-local:
+	make release-local
+	make publish-local
+
 
 release-and-deploy:
 	if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then make build-project-darwin release-darwin VERSION=${TRAVIS_TAG} GITHUB_TOKEN=${GITHUB_TOKEN} ; fi

Readme.md

@@ -9,27 +9,40 @@ Read more about Guaka:
 
 ## Installing
 
-### Installing with homebrew (mac)
-The easies way to install guaka is using homebrew
+### macOS
 
+You can install the Guaka generator CLI application in macOS with homebrew
+
+```
+brew install oarrabi/tap/guaka
 ```
-> brew install oarrabi/tap/guaka
+
+Alternatively, you can install it using the installer script:
+
 ```
+curl https://raw.githubusercontent.com/oarrabi/Guaka-Generator/master/scripts/install.sh -sSf | bash
+```
+
+Lastly you can install it by copying the binary from github and placing it in your path.    
+Go to [https://github.com/oarrabi/Guaka-Generator/releases](https://github.com/oarrabi/Guaka-Generator/releases)
+
+### GNU/Linux
 
-### Download the prebuilt version(mac)
-You can get the most stable version [here](https://github.com/oarrabi/Guaka-Generator/releases)
+If you are on GNU/Linux you can run the installer script:
+
+```
+curl https://raw.githubusercontent.com/oarrabi/Guaka-Generator/master/scripts/install.sh -sSf | bash
+```
+
+Alternatively, You can install it by copying the binary from github and placing it in your path.   
+ Go to [https://github.com/oarrabi/Guaka-Generator/releases](https://github.com/oarrabi/Guaka-Generator/releases)
 
 ### Build from source
 
 - Clone the repo
 - Run `make build-project` this generates `bin/guaka`
 - Copy `bin/guaka` to your bin folder
 
-## Todo
-
-- [ ] add unix stable builds
-- [ ] Add buil from source instructions for linux
-
 ## Contributing
 
 Just send a PR! We don't bite ;)

docker-compose.yaml

@@ -0,0 +1,7 @@
+swift:
+  image: swiftdocker/swift
+  volumes:
+    - .:/work
+  environment:
+    PWD: /work
+  command: make release-linux-local

scripts/github-release.sh

@@ -0,0 +1,4 @@
+[ -z ${VERSION+x} ] && { echo "VERSION is missing"; exit 1; }
+[ -z ${GITHUB_TOKEN+x} ] && { echo "GITHUB_TOKEN is missing"; exit 1; }
+
+github-release release --user oarrabi --security-token ${GITHUB_TOKEN} --repo Guaka-Generator --tag ${VERSION} --name "Version ${VERSION}"

scripts/publish-homebrew-mac.sh

@@ -1,16 +1,37 @@
-if [ -z "$VERSION" ]; then
-    echo "VERSION is missing"
+[ -z ${VERSION+x} ] && { echo "VERSION is missing"; exit 1; }
+
+FOLDER=guaka-generator-${VERSION}-darwin-X64
+FILE=${FOLDER}.tar.bz2
+
+if [ ! -f release/${FOLDER}/${FILE} ]; then
+    echo "
+    release/${FOLDER}/${FILE} not found!
+    "
     exit 1
 fi
 
-SHA=$(shasum -a 256 bin/darwin/guaka | cut -f 1 -d " ")
+BRANCH="releasing-${VERSION}"
+SHA=$(shasum -a 256 release/${FOLDER}/${FILE} | cut -f 1 -d " ")
 echo $SHA
 
 cd /tmp
-git clone https://github.com/oarrabi/homebrew-tap.git
+git clone git@github.com:oarrabi/homebrew-tap.git
 cd homebrew-tap
-sed -i.bak s/"sha256 \".*\""/"sha256 \"${SHA}\""/g guaka.rb
-sed -i.bak s/"version \".*\""/"version \"${VERSION}\""/g guaka.rb
+git checkout -b ${BRANCH}
+
+echo "class Guaka < Formula" > guaka.rb
+echo "  url \"https://github.com/oarrabi/Guaka-Generator/releases/download/${VERSION}/${FILE}\"" >> guaka.rb
+echo "  version \"${VERSION}\"" >> guaka.rb
+echo "  sha256 \"${SHA}\" " >> guaka.rb
+echo "" >> guaka.rb
+echo "  def install" >> guaka.rb
+echo "    bin.install \"guaka\"" >> guaka.rb
+echo "  end" >> guaka.rb
+echo "end" >> guaka.rb
+
 git add guaka.rb
 git commit -m "Releasing Guaka-Generator version ${VERSION}"
+git push origin ${BRANCH}
+
+hub pull-request -m "Releasing Guaka-Generator version ${VERSION}"
 rm -rf /tmp/homebrew-tap

scripts/release-common.sh

@@ -4,10 +4,10 @@
 # $3 binary to be released.
 
 build_tarball() {
-    RELEASE_DIR=/tmp/$2
+    RELEASE_DIR=${PWD}/release/$2
     rm -rf $RELEASE_DIR
     mkdir -p $RELEASE_DIR
-    mv $3 $RELEASE_DIR/
+    cp $3 $RELEASE_DIR/
     RELEASE_TARBALL=$2.tar.bz2
     cd $RELEASE_DIR && tar -cjSf $RELEASE_TARBALL guaka
     RELEASE_TARBALL_PATH=$RELEASE_DIR/$RELEASE_TARBALL
@@ -30,8 +30,6 @@ release() {
     RELEASE_TARBALL=$RELEASE.tar.bz2
 
     build_tarball RELEASE_TARBALL_PATH $RELEASE $BINARY
-
-    github-release release --user oarrabi --security-token ${GITHUB_TOKEN} --repo Guaka-Generator --tag ${VERSION} --name "Version ${VERSION}"
     github-release upload --user oarrabi --security-token ${GITHUB_TOKEN} --repo Guaka-Generator --tag ${VERSION} --name $RELEASE_TARBALL --file $RELEASE_TARBALL_PATH
 }