Skip to content

Commit

Permalink
Bumping the version and cleaning up the makefile
Browse files Browse the repository at this point in the history
  • Loading branch information
Tim Anema committed Aug 25, 2017
1 parent 217b965 commit f1f23ca
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 11 deletions.
22 changes: 12 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
.PHONY: build
install: # Build and install the theme binary
install: ## Build and install the theme binary
@go install github.com/Shopify/themekit/cmd/theme;
test: ## Run all tests
@go test -race -cover $(shell glide novendor)
vet: ## Verify go code.
@go vet $(shell glide novendor)
lint: ## Lint all packages
@glide novendor | xargs -n 1 golint -set_exit_status
check: lint vet test # lint, vet and test the code
all: clean windows mac linux # will build a binary for all platforms
release: # will run release on the built binaries uploading them to S3
check: lint vet test ## lint, vet and test the code
all: clean windows mac linux ## will build a binary for all platforms
release: ## will run release on the built binaries uploading them to S3
@go install github.com/Shopify/themekit/cmd/tkrelease && tkrelease $(shell git tag --points-at HEAD)
dist: check all ## Build binaries for all platforms and upload to S3
@$(MAKE) release && $(MAKE) gen_sha
Expand All @@ -23,17 +23,17 @@ build:
-o build/dist/${GOOS}-${GOARCH}/theme${EXT} \
github.com/Shopify/themekit/cmd/theme && \
echo "[${GOOS}-${GOARCH}] build complete";
windows: win32 win64 ## Build binaries for Windows (32 and 64 bit)
windows: win32 win64 # Build binaries for Windows (32 and 64 bit)
win32:
@export GOOS=windows GOARCH=386 EXT=.exe; $(MAKE) build;
win64:
@export GOOS=windows GOARCH=amd64 EXT=.exe; $(MAKE) build;
mac: mac32 mac64 ## Build binaries for Mac OS X (64 bit)
mac: mac32 mac64 # Build binaries for Mac OS X (64 bit)
mac32:
@export GOOS=darwin GOARCH=386; $(MAKE) build;
mac64:
@export GOOS=darwin GOARCH=amd64; $(MAKE) build;
linux: lin32 lin64 ## Build binaries for Linux (32 and 64 bit)
linux: lin32 lin64 # Build binaries for Linux (32 and 64 bit)
lin32:
@export GOOS=linux GOARCH=386; $(MAKE) build;
lin64:
Expand All @@ -42,9 +42,11 @@ gen_sha: ## Generate sha256 for a darwin build for usage with homebrew
@shasum -a 256 ./build/dist/darwin-amd64/theme
serve_docs: ## Start the dev server for the jekyll static site serving the theme kit docs.
@cd docs && jekyll serve
tools:
init_tools: ## Will install tools needed to work on this repo
@curl https://glide.sh/get | sh
@go get -u github.com/golang/lint/golint
@gem install jekyll
help:
@grep -E '^[a-zA-Z_0-9-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
help: ## Prints this message
@grep -E '^[a-zA-Z_0-9-]+:.*?## .*$$' $(MAKEFILE_LIST) | \
sort | \
awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
2 changes: 1 addition & 1 deletion kit/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (

var (
// ThemeKitVersion is the version build of the library
ThemeKitVersion, _ = version.NewVersion("0.7.2")
ThemeKitVersion, _ = version.NewVersion("0.7.3")
// ThemeKitReleasesURL is the url that fetches all versions of themekit used for.
// updating themekit. Change this for testing reasons.
ThemeKitReleasesURL = "https://shopify-themekit.s3.amazonaws.com/releases/all.json"
Expand Down

0 comments on commit f1f23ca

Please sign in to comment.