fix: mage installation with go1.18 (backport #33083) (#33149)

elastic · Sep 21, 2022 · d49292d · d49292d
1 parent 3640a7d
commit d49292d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -88,6 +88,10 @@ pipeline {
       steps {
         withGithubNotify(context: "Checks") {
           stageStatusCache(id: 'Checks'){
+            // 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"
+            }
             withBeatsEnv(archive: false, id: "checks") {
               dumpVariables()
               whenTrue(env.ONLY_DOCS == 'false') {

diff --git a/Makefile b/Makefile
@@ -235,3 +235,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
diff --git a/dev-tools/make/mage-install.mk b/dev-tools/make/mage-install.mk
@@ -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