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

fix: mage installation with go1.18 #33083

Merged
merged 5 commits into from
Sep 14, 2022
Merged

fix: mage installation with go1.18 #33083

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5393b29
path for the mage with go1.18 has changed
v1v Sep 14, 2022
2f2c6a2
ci: test the command in the CI pipeline
v1v Sep 14, 2022
454e95f
ci: set HOME
v1v Sep 14, 2022
a3d04c9
new make goal to validate the mage installation
v1v Sep 14, 2022
0390d57
unrequired path when using go install
v1v Sep 14, 2022
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
4 changes: 4 additions & 0 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,10 @@ pipeline {
steps {
withGithubNotify(context: "Lint") {
stageStatusCache(id: 'Lint'){
// test the ./dev-tools/run_with_go_ver used by the Unified Release process
dir("${BASE_DIR}") {
sh "HOME=${WORKSPACE} GO_VERSION=${GO_VERSION} ./dev-tools/run_with_go_ver make test-mage"
}
Comment on lines +91 to +93
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This works

image

withBeatsEnv(archive: false, id: "lint") {
dumpVariables()
whenTrue(env.ONLY_DOCS == 'false') {
Expand Down
4 changes: 4 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,3 +237,7 @@ beats-dashboards: mage update
build/distributions/dependencies.csv: $(PYTHON)
@mkdir -p build/distributions
$(PYTHON) dev-tools/dependencies-report --csv $@

## test-mage : Test the mage installation used by the Unified Release process
test-mage: mage
@mage dumpVariables
2 changes: 1 addition & 1 deletion dev-tools/make/mage-install.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export MAGE_IMPORT_PATH
mage:
ifndef MAGE_PRESENT
@echo Installing mage $(MAGE_VERSION).
@go get -ldflags="-X $(MAGE_IMPORT_PATH)/mage.gitTag=$(MAGE_VERSION)" ${MAGE_IMPORT_PATH}@$(MAGE_VERSION)
@go install -ldflags="-X $(MAGE_IMPORT_PATH)/mage.gitTag=$(MAGE_VERSION)" ${MAGE_IMPORT_PATH}@$(MAGE_VERSION)
@-mage -clean
endif
@true