Skip to content
This repository has been archived by the owner on Feb 26, 2023. It is now read-only.

Commit

Permalink
Move to 'dep' from 'govendor'
Browse files Browse the repository at this point in the history
Enable NewRelic integration

Bumped Go from 1.9 to 1.12

Bumped Nomad to 0.8.7

Signed-off-by: Christian Winther <jippignu@gmail.com>
  • Loading branch information
jippi committed May 16, 2019
1 parent 882845f commit 866391f
Show file tree
Hide file tree
Showing 9 changed files with 414 additions and 453 deletions.
1 change: 1 addition & 0 deletions .gitignore
@@ -1,6 +1,7 @@
frontend/node_modules
backend/vendor
backend/backend
backend/bindata.go

.tern-port
.sass-cache
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -3,7 +3,7 @@ sudo: required
language: go

go:
- 1.9
- "1.12"

services:
- docker
Expand Down
291 changes: 291 additions & 0 deletions backend/Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

46 changes: 46 additions & 0 deletions backend/Gopkg.toml
@@ -0,0 +1,46 @@
# Gopkg.toml example
#
# Refer to https://golang.github.io/dep/docs/Gopkg.toml.html
# for detailed Gopkg.toml documentation.
#
# required = ["github.com/user/thing/cmd/thing"]
# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
#
# [[constraint]]
# name = "github.com/user/project"
# version = "1.0.0"
#
# [[constraint]]
# name = "github.com/user/project2"
# branch = "dev"
# source = "github.com/myfork/project2"
#
# [[override]]
# name = "github.com/x/y"
# version = "2.4.0"
#
# [prune]
# non-go = false
# go-tests = true
# unused-packages = true


[[constraint]]
name = "github.com/elazarl/go-bindata-assetfs"
version = "1.0.0"

[[constraint]]
name = "github.com/hashicorp/consul"
version = "1.5.0"

[[constraint]]
name = "github.com/hashicorp/nomad"
version = "0.8.7"

[[constraint]]
name = "github.com/newrelic/go-agent"
version = "2.7.0"

[prune]
go-tests = true
unused-packages = true
8 changes: 4 additions & 4 deletions backend/Makefile
@@ -1,6 +1,6 @@
VETARGS?=-all
EXTERNAL_TOOLS=\
github.com/kardianos/govendor \
github.com/golang/dep/cmd/dep \
github.com/jteeuwen/go-bindata/... \
github.com/elazarl/go-bindata-assetfs/...

Expand All @@ -23,7 +23,7 @@ GET_GOARCH = $(word 2,$(subst -, ,$1))
BINARIES = $(addprefix $(BUILD_DIR)/hashi-ui-, $(GOBUILD))
$(BINARIES): $(BUILD_DIR)/hashi-ui-%: $(BUILD_DIR) bindata_assetfs.go
@echo "=> building $@ ..."
GOOS=$(call GET_GOOS,$*) GOARCH=$(call GET_GOARCH,$*) CGO_ENABLED=0 govendor build -o $@ -ldflags $(GO_LDFLAGS)
GOOS=$(call GET_GOOS,$*) GOARCH=$(call GET_GOARCH,$*) CGO_ENABLED=0 go build -o $@ -ldflags $(GO_LDFLAGS)

.PHONY: install
install:
Expand All @@ -35,8 +35,8 @@ install:
@echo "=> installing go-ps library..."
go get github.com/mitchellh/go-ps

@echo "=> govendor sync..."
govendor sync
@echo "=> dep ensure -vendor-only..."
dep ensure -vendor-only

.PHONY: fmt
fmt:
Expand Down

0 comments on commit 866391f

Please sign in to comment.