Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: avoid to modify go.mod file #16842

Merged
merged 7 commits into from
Mar 6, 2020
Merged

ci: avoid to modify go.mod file #16842

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0470c63
fix: avoid to modify go.mod file
kuisathaverat Mar 5, 2020
88f0e9a
test: do we need govendor?
kuisathaverat Mar 5, 2020
3d68225
fix: disable modules also when install mage
kuisathaverat Mar 5, 2020
55c9cb9
Update .ci/scripts/install-tools.bat
kuisathaverat Mar 6, 2020
78c7c6e
remove govendor code
kuisathaverat Mar 6, 2020
a7afff3
Update .ci/scripts/install-tools.bat
kuisathaverat Mar 6, 2020
58c6fb0
Merge branch 'master' into fix/make-check
kuisathaverat Mar 6, 2020
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
3 changes: 2 additions & 1 deletion .ci/scripts/install-go.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,5 @@ chmod +x "${GVM_CMD}"
gvm ${GO_VERSION}|cut -d ' ' -f 2|tr -d '\"' > ${PROPERTIES_FILE}

eval $(gvm ${GO_VERSION})
go get -u github.com/kardianos/govendor
# see https://github.com/golang/go/issues/27643
# GO111MODULE=off go get -u github.com/kardianos/govendor
kuisathaverat marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 1 addition & 1 deletion .ci/scripts/install-tools.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ IF ERRORLEVEL 1 (
curl -sL -o %WORKSPACE%\bin\gvm.exe https://github.com/andrewkroh/gvm/releases/download/v0.2.1/gvm-windows-amd64.exe
)
FOR /f "tokens=*" %%i IN ('"gvm.exe" use %GO_VERSION% --format=batch') DO %%i

set GO111MODULE=off
kuisathaverat marked this conversation as resolved.
Show resolved Hide resolved
go install github.com/elastic/beats/vendor/github.com/magefile/mage
kuisathaverat marked this conversation as resolved.
Show resolved Hide resolved