Merge pull request #16 from cmacknz/fix-go-version-in-ci

Fix go version in CI
elastic · Jun 7, 2022 · c0aac54 · c0aac54
2 parents 5590cbc + 52c5399
commit c0aac54
Show file tree

Hide file tree

Showing 5 changed files with 123 additions and 225 deletions.
diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile
@@ -30,13 +30,16 @@ pipeline {
         deleteDir()
         gitCheckout(basedir: "${BASE_DIR}", githubNotifyFirstTimeContributor: true)
         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(){
+            withMageEnv(version: "${env.GO_VERSION}"){
               sh(label: 'Mage check', script: 'mage -v check')
             }
           }

diff --git a/go.mod b/go.mod
@@ -5,7 +5,7 @@ go 1.16
 require (
 	github.com/docker/docker v20.10.12+incompatible
 	github.com/docker/go-connections v0.4.0
-	github.com/elastic/elastic-agent-libs v0.0.0-20220303160015-5b4e674da3dd
+	github.com/elastic/elastic-agent-libs v0.2.5
 	github.com/magefile/mage v1.12.1
 	github.com/stretchr/testify v1.7.0
 	golang.org/x/net v0.0.0-20220225172249-27dd8689420f
@@ -15,10 +15,11 @@ require (
 )
 
 require (
-	github.com/containerd/containerd v1.5.7 // indirect
+	github.com/containerd/containerd v1.5.10 // indirect
 	github.com/docker/distribution v2.8.0+incompatible // indirect
-	github.com/elastic/go-ucfg v0.8.4
+	github.com/elastic/go-licenser v0.4.0
+	github.com/elastic/go-ucfg v0.8.5
 	github.com/morikuni/aec v1.0.0 // indirect
-	github.com/opencontainers/image-spec v1.0.2-0.20190823105129-775207bd45b6 // indirect
+	go.elastic.co/go-licence-detector v0.5.0
 	gopkg.in/yaml.v2 v2.4.0
 )