Skip to content

Commit

Permalink
Install mage and goimports from vendor folder (#16836)
Browse files Browse the repository at this point in the history
  • Loading branch information
@kvch
kvch authored Mar 6, 2020
1 parent bb17653 commit e5322af
Show file tree
Hide file tree
Showing 12 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .ci/scripts/install-tools.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ IF ERRORLEVEL 1 (
)
FOR /f "tokens=*" %%i IN ('"gvm.exe" use %GO_VERSION% --format=batch') DO %%i

go install github.com/elastic/beats/vendor/github.com/magefile/mage
go install -mod=vendor github.com/magefile/mage
2 changes: 1 addition & 1 deletion auditbeat/make.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ REM
REM After running this once you may invoke mage.exe directly.

WHERE mage
IF %ERRORLEVEL% NEQ 0 go install github.com/elastic/beats/vendor/github.com/magefile/mage
IF %ERRORLEVEL% NEQ 0 go install -mod=vendor github.com/magefile/mage

mage %*
2 changes: 1 addition & 1 deletion filebeat/make.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ REM
REM After running this once you may invoke mage.exe directly.

WHERE mage
IF %ERRORLEVEL% NEQ 0 go install github.com/elastic/beats/vendor/github.com/magefile/mage
IF %ERRORLEVEL% NEQ 0 go install -mod=vendor github.com/magefile/mage

mage %*
2 changes: 1 addition & 1 deletion heartbeat/make.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ REM
REM After running this once you may invoke mage.exe directly.

WHERE mage
IF %ERRORLEVEL% NEQ 0 go install github.com/elastic/beats/vendor/github.com/magefile/mage
IF %ERRORLEVEL% NEQ 0 go install -mod=vendor github.com/magefile/mage

mage %*
2 changes: 1 addition & 1 deletion libbeat/make.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ REM
REM After running this once you may invoke mage.exe directly.

WHERE mage
IF %ERRORLEVEL% NEQ 0 go install github.com/elastic/beats/vendor/github.com/magefile/mage
IF %ERRORLEVEL% NEQ 0 go install -mod=vendor github.com/magefile/mage

mage %*
2 changes: 1 addition & 1 deletion libbeat/scripts/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ TESTIFY_TOOL_REPO?=github.com/stretchr/testify/assert
NOW=$(shell date -u '+%Y-%m-%dT%H:%M:%SZ')
GOBUILD_FLAGS?=-ldflags "-X github.com/elastic/beats/libbeat/version.buildTime=$(NOW) -X github.com/elastic/beats/libbeat/version.commit=$(COMMIT_ID)"
GOIMPORTS=goimports
GOIMPORTS_REPO?=github.com/elastic/beats/vendor/golang.org/x/tools/cmd/goimports
GOIMPORTS_REPO?=golang.org/x/tools/cmd/goimports
GOIMPORTS_LOCAL_PREFIX?=github.com/elastic
GOLINT=golint
GOLINT_REPO?=golang.org/x/lint/golint
Expand Down
2 changes: 1 addition & 1 deletion make.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ REM
REM After running this once you may invoke mage.exe directly.

WHERE mage
IF %ERRORLEVEL% NEQ 0 go install github.com/elastic/beats/vendor/github.com/magefile/mage
IF %ERRORLEVEL% NEQ 0 go install -mod=vendor github.com/magefile/mage

mage %*
2 changes: 1 addition & 1 deletion metricbeat/make.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ REM
REM After running this once you may invoke mage.exe directly.

WHERE mage
IF %ERRORLEVEL% NEQ 0 go install github.com/elastic/beats/vendor/github.com/magefile/mage
IF %ERRORLEVEL% NEQ 0 go install -mod=vendor github.com/magefile/mage

mage %*
2 changes: 1 addition & 1 deletion packetbeat/make.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ REM
REM After running this once you may invoke mage.exe directly.

WHERE mage
IF %ERRORLEVEL% NEQ 0 go install github.com/elastic/beats/vendor/github.com/magefile/mage
IF %ERRORLEVEL% NEQ 0 go install -mod=vendor github.com/magefile/mage

mage %*
2 changes: 1 addition & 1 deletion winlogbeat/make.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ REM
REM After running this once you may invoke mage.exe directly.

WHERE mage
IF %ERRORLEVEL% NEQ 0 go install github.com/elastic/beats/vendor/github.com/magefile/mage
IF %ERRORLEVEL% NEQ 0 go install -mod=vendor github.com/magefile/mage

mage %*
2 changes: 1 addition & 1 deletion x-pack/filebeat/make.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ REM
REM After running this once you may invoke mage.exe directly.

WHERE mage
IF %ERRORLEVEL% NEQ 0 go install github.com/elastic/beats/vendor/github.com/magefile/mage
IF %ERRORLEVEL% NEQ 0 go install -mod=vendor github.com/magefile/mage

mage %*
2 changes: 1 addition & 1 deletion x-pack/winlogbeat/make.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ REM
REM After running this once you may invoke mage.exe directly.

WHERE mage
IF %ERRORLEVEL% NEQ 0 go install github.com/elastic/beats/vendor/github.com/magefile/mage
IF %ERRORLEVEL% NEQ 0 go install -mod=vendor github.com/magefile/mage

mage %*

0 comments on commit e5322af

Please sign in to comment.