diff --git a/Makefile b/Makefile index 2b24d89..e657bc5 100644 --- a/Makefile +++ b/Makefile @@ -6,9 +6,6 @@ VERSION = $(shell git describe --tags --match 'v[0-9]*\.[0-9]*\.[0-9]*' | sed 's ############################################################################### ## Building -## -## Travis CI Gimme is used to cross-compile -## https://github.com/travis-ci/gimme ############################################################################### .PHONY: build build_darwin build_linux @@ -25,32 +22,6 @@ build_linux: $(call compile,linux,amd64) -############################################################################### -## Packaging -## -## Effing Package Management - fpm is used for packaging -## https://github.com/jordansissel/fpm -## gnu-tar, rpmbuild is required -############################################################################### - -.PHONY: package package_deb package_rpm -package: package_deb package_rpm - -package = fpm -t $(1) \ - -n $(NAME) \ - --force \ - --version $(VERSION) \ - --rpm-os linux \ - --package $(BUILDDIR) \ - -s dir $(BUILDDIR)/$(NAME)-$(VERSION)-linux-amd64=/usr/local/bin/$(NAME) - -package_deb: - $(call package,deb) - -package_rpm: - $(call package,rpm) - - ############################################################################### ## Clean ## diff --git a/README.md b/README.md index c41d396..57957f0 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,10 @@ # Couchlock - -[![Travis](https://img.shields.io/travis/tomologic/couchlock.svg?style=flat-square)](https://travis-ci.org/tomologic/couchlock) -[![](https://badge.imagelayers.io/tomologic/couchlock:latest.svg)](https://imagelayers.io/?images=tomologic/couchlock:latest 'Get your own badge on imagelayers.io') - Couchlock those running pipelines! ## What is this? -This is currently the way we are trying to get global locks into our CD pipelines. Historically tried different Jenkins plugins for mutexes/semaphores and hacks by using jobs as locks. +This is currently the way we are trying to get global locks into our CD pipelines. Historically tried different Jenkins plugins for mutexes/semaphores and hacks by using jobs as locks. Lock that shared resource! @@ -40,34 +36,20 @@ Couchlock is provided through our [homebrew tap](https://github.com/tomologic/ho brew install tomologic/tap/couchlock ``` -## Build - -[Travis CI Gimme](https://github.com/travis-ci/gimme) is used to cross-compile couchlock. +## Build & package -``` -$ brew install gimme -``` +[GoReleaser](https://goreleaser.com/intro/) is used to build and package this +application. ``` -$ make build -$ make build_darwin -$ make build_linux -``` +# Install +brew install goreleaser/tap/goreleaser -## Package +# Local-only release +goreleaser release --snapshot --rm-dist -[Effing Package Management - fpm](https://github.com/jordansissel/fpm) is used for packaging. - -``` -$ brew install gnu-tar -$ brew install rpm -$ gem install fpm -``` - -``` -$ make package -$ make package_deb -$ make package_rpm +# Build for local testing +goreleaser build --single-target ``` ## CouchDB