From f92273ec215f9fc39f200bacace70c24fef99f4f Mon Sep 17 00:00:00 2001 From: David Pordomingo Date: Sat, 2 Mar 2019 21:09:49 +0100 Subject: [PATCH] Lock esc dependency using dep Signed-off-by: David Pordomingo --- Gopkg.toml | 2 ++ Makefile | 13 ++++++++++--- tools/.gitignore | 1 + tools/Gopkg.lock | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ tools/Gopkg.toml | 7 +++++++ tools/tools.go | 7 +++++++ 6 files changed, 75 insertions(+), 3 deletions(-) create mode 100644 tools/.gitignore create mode 100644 tools/Gopkg.lock create mode 100644 tools/Gopkg.toml create mode 100644 tools/tools.go diff --git a/Gopkg.toml b/Gopkg.toml index 33771820..f579cf80 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -1,3 +1,5 @@ +ignored = ["github.com/mjibson/esc"] + [prune] go-tests = true unused-packages = true diff --git a/Makefile b/Makefile index 55bee958..8fca1930 100644 --- a/Makefile +++ b/Makefile @@ -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 @@ -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) @@ -125,4 +133,3 @@ endif .PHONY: ci-integration-dependencies ci-integration-dependencies: prepare-services ci-start-bblfsh - diff --git a/tools/.gitignore b/tools/.gitignore new file mode 100644 index 00000000..61ead866 --- /dev/null +++ b/tools/.gitignore @@ -0,0 +1 @@ +/vendor diff --git a/tools/Gopkg.lock b/tools/Gopkg.lock new file mode 100644 index 00000000..4d12ff78 --- /dev/null +++ b/tools/Gopkg.lock @@ -0,0 +1,48 @@ +# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. + + +[[projects]] + digest = "1:4188aa72a000b77a01eaf88d53de659bfbfd98988965b32ff95b7dd1270ae4d9" + name = "github.com/mjibson/esc" + packages = [ + ".", + "embed", + ] + pruneopts = "UT" + revision = "0ea7db170df78dcddf3e223365f444163147fe89" + +[[projects]] + digest = "1:cf31692c14422fa27c83a05292eb5cbe0fb2775972e8f1f8446a71549bd8980b" + name = "github.com/pkg/errors" + packages = ["."] + pruneopts = "UT" + revision = "ba968bfe8b2f7e042a574c888954fccecfa385b4" + version = "v0.8.1" + +[[projects]] + branch = "master" + digest = "1:e46d8e20161401a9cf8765dfa428494a3492a0b56fe114156b7da792bf41ba78" + name = "golang.org/x/tools" + packages = [ + "go/ast/astutil", + "go/gcexportdata", + "go/internal/cgo", + "go/internal/gcimporter", + "go/internal/packagesdriver", + "go/packages", + "go/types/typeutil", + "imports", + "internal/fastwalk", + "internal/gopathwalk", + "internal/module", + "internal/semver", + ] + pruneopts = "UT" + revision = "589c23e65e65055d47b9ad4a99723bc389136265" + +[solve-meta] + analyzer-name = "dep" + analyzer-version = 1 + input-imports = ["github.com/mjibson/esc"] + solver-name = "gps-cdcl" + solver-version = 1 diff --git a/tools/Gopkg.toml b/tools/Gopkg.toml new file mode 100644 index 00000000..495f85b0 --- /dev/null +++ b/tools/Gopkg.toml @@ -0,0 +1,7 @@ +[[constraint]] + name = "github.com/mjibson/esc" + revision = "0ea7db170df78dcddf3e223365f444163147fe89" + +[prune] + go-tests = true + unused-packages = true diff --git a/tools/tools.go b/tools/tools.go new file mode 100644 index 00000000..25338a7a --- /dev/null +++ b/tools/tools.go @@ -0,0 +1,7 @@ +// +build tools + +package tools + +import ( + _ "github.com/mjibson/esc" +)