Skip to content

Commit

Permalink
fixup! fixup! fixup! fixup! fixup! Adding some very basic integration…
Browse files Browse the repository at this point in the history
… tests
  • Loading branch information
hairyhenderson committed Apr 10, 2017
1 parent 1af4669 commit c888a4f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ platforms := linux-amd64 linux-386 linux-arm linux-arm64 darwin-amd64 windows-am
define gocross
GOOS=$(1) GOARCH=$(2) \
$(GO) build \
-ldflags "-w -s $(COMMIT_FLAG) $(VERSION_FLAG) -extldflags '-static'" \
-ldflags "-w -s $(COMMIT_FLAG) $(VERSION_FLAG)" \
-o $(PREFIX)/bin/$(PKG_NAME)_$(1)-$(2)$(call extension,$(1));
endef

Expand All @@ -40,7 +40,7 @@ $(PREFIX)/bin/$(PKG_NAME)_%: $(shell find . -type f -name '*.go')
$(call gocross,$(shell echo $* | sed 's/\([^-]*\)-\([^.]*\).*/\1/'),$(shell echo $* | sed 's/\([^-]*\)-\([^.]*\).*/\2/'))

$(PREFIX)/bin/$(PKG_NAME)$(call extension,$(GOOS)): $(shell find . -type f -name '*.go')
$(GO) build -ldflags "-w -s $(COMMIT_FLAG) $(VERSION_FLAG) -extldflags '-static'" -o $@
$(GO) build -ldflags "-w -s $(COMMIT_FLAG) $(VERSION_FLAG)" -o $@

build: $(PREFIX)/bin/$(PKG_NAME)$(call extension,$(GOOS))

Expand Down
8 changes: 5 additions & 3 deletions circle.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
version: 2
jobs:
build:
machine: true
# machine: true
docker:
- image: golang:1.8
environment:
- CIRCLE_TEST_REPORTS: /tmp/test-results
working_directory: ~/.go_workspace/src/github.com/hairyhenderson/gomplate
working_directory: /go/src/github.com/hairyhenderson/gomplate
steps:
- checkout
- run: env
Expand All @@ -22,7 +24,7 @@ jobs:
- save_cache:
key: gobins-{{ checksum "glide.lock" }}
paths:
- ~/.go_workspace/bin
- /go/bin
- run: make build
- run:
name: Unit Tests
Expand Down

0 comments on commit c888a4f

Please sign in to comment.