Install tools (mage, goimports, etc.) from vendor folder #15998
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,13 @@ | ||
| MAGE_VERSION ?= v1.9.0 | ||
| MAGE_PRESENT := $(shell mage --version 2> /dev/null | grep $(MAGE_VERSION)) | ||
| MAGE_IMPORT_PATH ?= github.com/magefile/mage | ||
| export MAGE_IMPORT_PATH | ||
|
|
||
| .PHONY: mage | ||
| mage: | ||
| ifndef MAGE_PRESENT | ||
| @echo Installing mage $(MAGE_VERSION) from vendor dir. | ||
| @go install -mod=vendor -ldflags="-X $(MAGE_IMPORT_PATH)/mage.gitTag=$(MAGE_VERSION)" ${MAGE_IMPORT_PATH} | ||
| @-mage -clean | ||
| endif | ||
| @true |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -51,6 +51,7 @@ require ( | |
| github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4 | ||
| github.com/elastic/ecs v1.4.0 | ||
| github.com/elastic/go-libaudit v0.4.0 | ||
| github.com/elastic/go-licenser v0.2.1 | ||
| github.com/elastic/go-lookslike v0.3.0 | ||
| github.com/elastic/go-lumber v0.1.0 | ||
| github.com/elastic/go-perf v0.0.0-20191212140718-9c656876f595 | ||
|
|
@@ -98,14 +99,13 @@ require ( | |
| github.com/mattn/go-isatty v0.0.2 // indirect | ||
| github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect | ||
| github.com/miekg/dns v1.1.15 | ||
| github.com/mitchellh/hashstructure v0.0.0-20170116052023-ab25296c0f51 | ||
| github.com/mitchellh/mapstructure v1.1.2 | ||
| github.com/morikuni/aec v1.0.0 // indirect | ||
| github.com/opencontainers/go-digest v1.0.0-rc1.0.20190228220655-ac19fd6e7483 // indirect | ||
| github.com/opencontainers/image-spec v1.0.2-0.20190823105129-775207bd45b6 // indirect | ||
| github.com/opencontainers/runc v1.0.0-rc9 // indirect | ||
| github.com/pierrre/gotestcover v0.0.0-20160113212533-7b94f124d338 | ||
| github.com/pkg/errors v0.8.1 | ||
| github.com/pmezard/go-difflib v1.0.0 | ||
| github.com/prometheus/client_golang v1.1.1-0.20190913103102-20428fa0bffc // indirect | ||
|
|
@@ -121,6 +121,7 @@ require ( | |
| github.com/spf13/pflag v1.0.3 | ||
| github.com/stretchr/objx v0.1.2-0.20180702103455-b8b73a35e983 // indirect | ||
| github.com/stretchr/testify v1.4.0 | ||
| github.com/tsg/go-daemon v0.0.0-20200123164349-4b60efc26d5f | ||
| github.com/tsg/gopacket v0.0.0-20190320122513-dd3d0e41124a | ||
| github.com/urso/magetools v0.0.0-20200106130147-61080ed7b22b // indirect | ||
| github.com/vmware/govmomi v0.0.0-20170802214208-2cad15190b41 | ||
|
|
@@ -140,7 +141,6 @@ require ( | |
| google.golang.org/appengine v1.6.5 // indirect | ||
| google.golang.org/genproto v0.0.0-20191115221424-83cc0476cb11 | ||
| google.golang.org/grpc v1.25.1 // indirect | ||
|
Contributor
Author
There was a problem hiding this comment. It has been removed from master in the meantime: #15683 |
||
| gopkg.in/inf.v0 v0.9.0 | ||
| gopkg.in/jcmturner/gokrb5.v7 v7.3.0 // indirect | ||
| gopkg.in/mgo.v2 v2.0.0-20160818020120-3f83fa500528 | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| // Licensed to Elasticsearch B.V. under one or more contributor | ||
| // license agreements. See the NOTICE file distributed with | ||
| // this work for additional information regarding copyright | ||
| // ownership. Elasticsearch B.V. licenses this file to you under | ||
| // the Apache License, Version 2.0 (the "License"); you may | ||
| // not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| // +build tools | ||
|
|
||
| // This package contains the tool dependencies of the project. | ||
|
|
||
| package tools | ||
|
|
||
| import ( | ||
| _ "github.com/magefile/mage" | ||
|
kvch marked this conversation as resolved.
Outdated
|
||
| _ "github.com/pierrre/gotestcover" | ||
| _ "github.com/tsg/go-daemon" | ||
| _ "golang.org/x/tools/cmd/goimports" | ||
|
|
||
| _ "github.com/elastic/go-licenser" | ||
|
kvch marked this conversation as resolved.
Outdated
|
||
| ) | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see, we copied gotool from
go-txfileto the Beats repo. Btw.go-txfilemagefile uses the gotools package (minor improvements + generalization of this approach) fromhttps://github.com/urso/magetools.