Merge pull request #20 from cmacknz/fix-jenkins-go-version

Properly set Go version in CI.
elastic · Jun 7, 2022 · c42a742 · c42a742
2 parents 69feca1 + 3f3135a
commit c42a742
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile
@@ -30,14 +30,18 @@ pipeline {
         gitCheckout(basedir: "${BASE_DIR}", githubNotifyFirstTimeContributor: true)
         pipelineManager([ cancelPreviousRunningBuilds: [ when: 'PR' ] ])
         stash allowEmpty: true, name: 'source', useDefaultExcludes: false
+        dir("${BASE_DIR}"){
+          setEnvVar('GO_VERSION', readFile(".go-version").trim())
+        }
       }
     }
     stage('Lint'){
       steps {
         withGithubNotify(context: "Lint") {
           dir("${BASE_DIR}"){
-            withMageEnv(){
-              sh(label: 'Check', script: 'mage -v check')
+            withMageEnv(version: "${env.GO_VERSION}"){
+              cmd(label: 'mage notice', script: 'mage notice')
+              cmd(label: 'mage check', script: 'mage -v check')
             }
           }
         }
@@ -51,7 +55,7 @@ pipeline {
     //      deleteDir()
     //      unstash 'source'
     //      dir("${BASE_DIR}"){
-    //        withMageEnv(){
+    //        withMageEnv(version: "${env.GO_VERSION}"){
     //          sh(label: 'Build', script: 'mage -v check')
     //        }
     //    }