Skip to content

Commit

Permalink
Lock esc dependency using dep
Browse files Browse the repository at this point in the history
Signed-off-by: David Pordomingo <[email protected]>
  • Loading branch information
dpordomingo committed Mar 7, 2019
1 parent a26f548 commit f92273e
Show file tree
Hide file tree
Showing 6 changed files with 75 additions and 3 deletions.
2 changes: 2 additions & 0 deletions Gopkg.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
ignored = ["github.com/mjibson/esc"]

[prune]
go-tests = true
unused-packages = true
Expand Down
13 changes: 10 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
PROJECT = lookout
COMMANDS = cmd/lookoutd
DEPENDENCIES = \
gopkg.in/src-d/go-kallax.v1 \
github.com/mjibson/esc
gopkg.in/src-d/go-kallax.v1

# Backend services
POSTGRESQL_VERSION = 9.6
Expand All @@ -22,6 +21,15 @@ $(MAKEFILE):
git clone --quiet --depth 1 -b $(CI_BRANCH) $(CI_REPOSITORY) $(CI_PATH);
-include $(MAKEFILE)

$(GODEP):
export INSTALL_DIRECTORY=$(CI_PATH); \
curl https://raw.githubusercontent.com/golang/dep/master/install.sh | bash

dependencies: $(GODEP)
cd tools; \
../$(GODEP) ensure -v; \
$(GOCMD) install ./vendor/github.com/mjibson/esc;

# Main dockerfile
DOCKERFILES=./docker/Dockerfile:$(PROJECT)

Expand Down Expand Up @@ -125,4 +133,3 @@ endif

.PHONY: ci-integration-dependencies
ci-integration-dependencies: prepare-services ci-start-bblfsh

1 change: 1 addition & 0 deletions tools/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/vendor
48 changes: 48 additions & 0 deletions tools/Gopkg.lock

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

7 changes: 7 additions & 0 deletions tools/Gopkg.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[[constraint]]
name = "github.com/mjibson/esc"
revision = "0ea7db170df78dcddf3e223365f444163147fe89"

[prune]
go-tests = true
unused-packages = true
7 changes: 7 additions & 0 deletions tools/tools.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
// +build tools

package tools

import (
_ "github.com/mjibson/esc"
)

0 comments on commit f92273e

Please sign in to comment.