diff --git a/.drone.yml b/.drone.yml index 5fe8608..7c67f70 100644 --- a/.drone.yml +++ b/.drone.yml @@ -8,7 +8,7 @@ platform: steps: - name: test - image: golang:1.13 + image: golang:1.16 commands: - go test -cover ./... volumes: @@ -16,7 +16,7 @@ steps: path: /go - name: build - image: golang:1.13 + image: golang:1.16 commands: - sh scripts/build.sh volumes: diff --git a/command/daemon/daemon.go b/command/daemon/daemon.go index 015f3d2..63c9850 100644 --- a/command/daemon/daemon.go +++ b/command/daemon/daemon.go @@ -22,6 +22,7 @@ import ( "github.com/drone/runner-go/pipeline/reporter/history" "github.com/drone/runner-go/pipeline/reporter/remote" "github.com/drone/runner-go/pipeline/runtime" + "github.com/drone/runner-go/pipeline/uploader" "github.com/drone/runner-go/poller" "github.com/drone/runner-go/registry" "github.com/drone/runner-go/secret" @@ -109,6 +110,7 @@ func (c *daemonCommand) run(*kingpin.ParseContext) error { } remote := remote.New(cli) + upload := uploader.New(cli) tracer := history.New(remote) hook := loghistory.New() logrus.AddHook(hook) @@ -182,6 +184,7 @@ func (c *daemonCommand) run(*kingpin.ParseContext) error { Exec: runtime.NewExecer( tracer, remote, + upload, engine, config.Runner.Procs, ).Exec, diff --git a/command/daemon/process.go b/command/daemon/process.go index 07d6a4d..d3f05ae 100644 --- a/command/daemon/process.go +++ b/command/daemon/process.go @@ -9,6 +9,7 @@ import ( "github.com/drone-runners/drone-runner-docker/engine/compiler" "github.com/drone-runners/drone-runner-docker/engine/linter" "github.com/drone-runners/drone-runner-docker/engine/resource" + "github.com/drone/runner-go/pipeline/uploader" "github.com/drone/runner-go/client" "github.com/drone/runner-go/environ/provider" @@ -62,6 +63,7 @@ func (c *processCommand) run(*kingpin.ParseContext) error { } remote := remote.New(cli) + upload := uploader.New(cli) runner := &runtime.Runner{ Client: cli, @@ -118,6 +120,7 @@ func (c *processCommand) run(*kingpin.ParseContext) error { Exec: runtime.NewExecer( remote, remote, + upload, engine, config.Runner.Procs, ).Exec, diff --git a/command/exec.go b/command/exec.go index c623002..b8c8ffc 100644 --- a/command/exec.go +++ b/command/exec.go @@ -18,6 +18,7 @@ import ( "github.com/drone-runners/drone-runner-docker/engine/compiler" "github.com/drone-runners/drone-runner-docker/engine/linter" "github.com/drone-runners/drone-runner-docker/engine/resource" + "github.com/drone/drone-go/drone" "github.com/drone/envsubst" "github.com/drone/runner-go/environ" @@ -238,6 +239,7 @@ func (c *execCommand) run(*kingpin.ParseContext) error { err = runtime.NewExecer( pipeline.NopReporter(), console.New(c.Pretty), + pipeline.NopUploader(), engine, c.Procs, ).Exec(ctx, spec, state) diff --git a/go.mod b/go.mod index a1d1349..463ff77 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/drone-runners/drone-runner-docker -go 1.12 +go 1.16 replace github.com/docker/docker => github.com/docker/engine v17.12.0-ce-rc1.0.20200309214505-aa6a9891b09c+incompatible @@ -15,9 +15,9 @@ require ( github.com/docker/distribution v2.7.1+incompatible github.com/docker/docker v0.0.0-00010101000000-000000000000 github.com/docker/go-connections v0.3.0 // indirect - github.com/drone/drone-go v1.6.0 + github.com/drone/drone-go v1.7.1 github.com/drone/envsubst v1.0.3 - github.com/drone/runner-go v1.9.0 + github.com/drone/runner-go v1.11.0 github.com/drone/signal v1.0.0 github.com/ghodss/yaml v1.0.0 github.com/gogo/protobuf v0.0.0-20170307180453-100ba4e88506 // indirect diff --git a/go.sum b/go.sum index 73696d1..6c06392 100644 --- a/go.sum +++ b/go.sum @@ -36,14 +36,15 @@ github.com/docker/go-connections v0.3.0 h1:3lOnM9cSzgGwx8VfK/NGOW5fLQ0GjIlCkaktF github.com/docker/go-connections v0.3.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw= github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= -github.com/drone/drone-go v1.6.0 h1:HJXienGtXlUKLe8z0iDsX6012CE9/2of5pQpUiD+zSA= -github.com/drone/drone-go v1.6.0/go.mod h1:fxCf9jAnXDZV1yDr0ckTuWd1intvcQwfJmTRpTZ1mXg= -github.com/drone/envsubst v1.0.2 h1:dpYLMAspQHW0a8dZpLRKe9jCNvIGZPhCPrycZzIHdqo= +github.com/drone/drone-go v1.7.1 h1:ZX+3Rs8YHUSUQ5mkuMLmm1zr1ttiiE2YGNxF3AnyDKw= +github.com/drone/drone-go v1.7.1/go.mod h1:fxCf9jAnXDZV1yDr0ckTuWd1intvcQwfJmTRpTZ1mXg= github.com/drone/envsubst v1.0.2/go.mod h1:bkZbnc/2vh1M12Ecn7EYScpI4YGYU0etwLJICOWi8Z0= github.com/drone/envsubst v1.0.3 h1:PCIBwNDYjs50AsLZPYdfhSATKaRg/FJmDc2D6+C2x8g= github.com/drone/envsubst v1.0.3/go.mod h1:N2jZmlMufstn1KEqvbHjw40h1KyTmnVzHcSc9bFiJ2g= -github.com/drone/runner-go v1.9.0 h1:kVEk/hdgIBvTqPABnLO5t70o1wbZCJ5dycamd9TQNGE= -github.com/drone/runner-go v1.9.0/go.mod h1:rKn98jQVmPzrXYX8kPCupAn3QwxyhmR0lX9hvFiJJI8= +github.com/drone/runner-go v1.10.0 h1:IVfdfZi/p36D0hgXiVUieGJoLrvJTL02Kk3CXDVFInE= +github.com/drone/runner-go v1.10.0/go.mod h1:vu4pPPYDoeN6vdYQAY01GGGsAIW4aLganJNaa8Fx8zE= +github.com/drone/runner-go v1.11.0 h1:zcn8Hmi0H1I4pxdJCauykG5teu3AH84Uw4WM7VrKlIM= +github.com/drone/runner-go v1.11.0/go.mod h1:vu4pPPYDoeN6vdYQAY01GGGsAIW4aLganJNaa8Fx8zE= github.com/drone/signal v1.0.0 h1:NrnM2M/4yAuU/tXs6RP1a1ZfxnaHwYkd0kJurA1p6uI= github.com/drone/signal v1.0.0/go.mod h1:S8t92eFT0g4WUgEc/LxG+LCuiskpMNsG0ajAMGnyZpc= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=