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 go version in CI #16

Merged
merged 3 commits into from
Jun 7, 2022
Merged

Fix go version in CI #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ec2f1bd
Upgrade containerd to fix depandabot alerts.
cmacknz Jun 6, 2022
3c0f340
Read Go version for CI from .go-version file
cmacknz Jun 6, 2022
52c5399
Reuse mage targets from elastic-agent-libs
cmacknz Jun 6, 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
5 changes: 4 additions & 1 deletion .ci/Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
}
}
Expand Down
9 changes: 5 additions & 4 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
)
Loading