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

Replace glide with dep #27

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+742 −368
Open

Replace glide with dep #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
163 changes: 163 additions & 0 deletions cmd/yfuzz-cli/Gopkg.lock
View file
Open in desktop

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

20 changes: 20 additions & 0 deletions cmd/yfuzz-cli/Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
ignored = [
"github.com/yahoo/yfuzz/pkg/schema",
"github.com/yahoo/yfuzz/pkg/version",
]

[[constraint]]
name = "github.com/fatih/color"
version = "1.7.0"

[[constraint]]
name = "github.com/spf13/viper"
version = "1.0.2"

[[constraint]]
name = "gopkg.in/urfave/cli.v1"
version = "1.20.0"

[prune]
go-tests = true
unused-packages = true
2 changes: 1 addition & 1 deletion cmd/yfuzz-cli/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ A simple command-line utility for [yFuzz](https://github.com/yahoo/yfuzz).
- [Settings](#settings)

## Prerequisites:
To build the CLI, you will need [Go](https://golang.org/), [Glide](https://glide.sh/), and [Make](https://www.gnu.org/software/make/).
To build the CLI, you will need [Go](https://golang.org/), [Dep](https://golang.github.io/dep/), and [Make](https://www.gnu.org/software/make/).

## Install

Expand Down
55 changes: 0 additions & 55 deletions cmd/yfuzz-cli/glide.lock
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions cmd/yfuzz-cli/glide.yaml
View file
Open in desktop

This file was deleted.

16 changes: 12 additions & 4 deletions scripts/go.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,15 @@

TARGET ?= $(shell basename `pwd`)
YFUZZ_BUILD_VERSION ?= $(shell git describe --tags --abbrev=0)_local
HAS_DEP := $(shell command -v dep;)

# Run go build or go install with the appropriate flags
define _build
go $(1) -ldflags "-s -w -X github.com/yahoo/yfuzz/pkg/version.Version=${YFUZZ_BUILD_VERSION} \
-X github.com/yahoo/yfuzz/pkg/version.Timestamp=$(shell date +'%Y/%m/%d_%H:%M:%S')"
endef

all: deps lint test build
all: deps dep-check lint test build

clean:
@echo Cleaning binaries, vendor for ${TARGET}.
Expand All @@ -26,15 +27,22 @@ clean:

deps:
@echo Installing dependencies for ${TARGET}.
ifndef HAS_DEP
curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
endif
ifeq (${verbose},true)
glide install
dep ensure -v
else
glide -q install
dep ensure
endif
ifndef TRAVIS
go get -u github.com/golangci/golangci-lint/cmd/golangci-lint
endif

dep-check:
@echo Running dep check to verify consistency across Gopkg.toml, Gopkg.lock, and vendor.
dep check

lint:
ifdef TRAVIS
@echo Skipping lint in Travis, linting is done by https://golangci.com/
Expand All @@ -59,4 +67,4 @@ install:
@echo Installing ${TARGET} ${YFUZZ_BUILD_VERSION}
$(call _build,install)

.PHONY: clean deps lint test build install
.PHONY: clean deps dep-check lint test build install
Loading