diff --git a/CHANGELOG.md b/CHANGELOG.md index 1cc59edf..6defed4e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## Unreleased +### Added +- support for legacy environment variables +- support for legacy workspace based on repository name +- support for github deployment hooks +- provide base sha for github pull requests ## [1.2.1] - 2019-06-11 ### Added diff --git a/go.mod b/go.mod index a416af7f..08dc752e 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,7 @@ require ( github.com/drone/drone-go v1.0.5-0.20190427184118-618e4496482e github.com/drone/drone-runtime v1.0.6 github.com/drone/drone-ui v0.0.0-20190530175131-92ba3df1e0a9 - github.com/drone/drone-yaml v1.2.1-0.20190717150947-d14ac477f983 + github.com/drone/drone-yaml v1.2.2-0.20190719012529-c50000a465ee github.com/drone/envsubst v1.0.1 github.com/drone/go-license v1.0.2 github.com/drone/go-login v1.0.4-0.20190311170324-2a4df4f242a2 diff --git a/go.sum b/go.sum index 91aa4a0b..65d81d36 100644 --- a/go.sum +++ b/go.sum @@ -87,6 +87,10 @@ github.com/drone/drone-yaml v1.1.4-0.20190614011118-4889634ea9ae h1:CzpY1F9Ju46g github.com/drone/drone-yaml v1.1.4-0.20190614011118-4889634ea9ae/go.mod h1:l/ehbHx9TGs4jgzhRnP5d+M9tmRsAmWyBHWAFEOXrk4= github.com/drone/drone-yaml v1.2.1-0.20190717150947-d14ac477f983 h1:J59SqAC/DA1FuOXUvtGfYlhZSHegJL+AF9PnhXsxbKA= github.com/drone/drone-yaml v1.2.1-0.20190717150947-d14ac477f983/go.mod h1:l/ehbHx9TGs4jgzhRnP5d+M9tmRsAmWyBHWAFEOXrk4= +github.com/drone/drone-yaml v1.2.2-0.20190719011530-e8b24d482cda h1:vPXJLgkyScZ0WnjzATIUcQbSRUjcP9BtnC+CMA1sSOk= +github.com/drone/drone-yaml v1.2.2-0.20190719011530-e8b24d482cda/go.mod h1:l/ehbHx9TGs4jgzhRnP5d+M9tmRsAmWyBHWAFEOXrk4= +github.com/drone/drone-yaml v1.2.2-0.20190719012529-c50000a465ee h1:/zyEkv56+T6JxLkYgYYwZAMLKBgEnHA3fwZXiVI9nuE= +github.com/drone/drone-yaml v1.2.2-0.20190719012529-c50000a465ee/go.mod h1:l/ehbHx9TGs4jgzhRnP5d+M9tmRsAmWyBHWAFEOXrk4= github.com/drone/envsubst v1.0.1 h1:NOOStingM2sbBwsIUeQkKUz8ShwCUzmqMxWrpXItfPE= github.com/drone/envsubst v1.0.1/go.mod h1:bkZbnc/2vh1M12Ecn7EYScpI4YGYU0etwLJICOWi8Z0= github.com/drone/go-license v1.0.2 h1:7OwndfYk+Lp/cGHkxe4HUn/Ysrrw3WYH2pnd99yrkok= diff --git a/operator/runner/runner.go b/operator/runner/runner.go index 123ce24f..eb85e99b 100644 --- a/operator/runner/runner.go +++ b/operator/runner/runner.go @@ -188,6 +188,7 @@ func (r *Runner) Run(ctx context.Context, id int64) error { // the legacy yaml configuration file to the new format. y, err := converter.ConvertString(string(m.Config.Data), converter.Metadata{ Filename: m.Repo.Config, + URL: m.Repo.Link, Ref: m.Build.Ref, }) diff --git a/scheduler/queue/queue.go b/scheduler/queue/queue.go index bce12f0e..a849b4c8 100644 --- a/scheduler/queue/queue.go +++ b/scheduler/queue/queue.go @@ -151,24 +151,27 @@ func (q *queue) signal(ctx context.Context) error { continue } - // the worker is platform-specific. check to ensure - // the queue item matches the worker platform. - if w.os != item.OS { - continue - } - if w.arch != item.Arch { - continue - } - // if the pipeline defines a variant it must match - // the worker variant (e.g. arm6, arm7, etc). - if item.Variant != "" && item.Variant != w.variant { - continue - } - // if the pipeline defines a kernel version it must match - // the worker kernel version (e.g. 1709, 1803). - if item.Kernel != "" && item.Kernel != w.kernel { - continue + if w.os != "" || w.arch != "" || w.variant != "" || w.kernel != "" { + // the worker is platform-specific. check to ensure + // the queue item matches the worker platform. + if w.os != item.OS { + continue + } + if w.arch != item.Arch { + continue + } + // if the pipeline defines a variant it must match + // the worker variant (e.g. arm6, arm7, etc). + if item.Variant != "" && item.Variant != w.variant { + continue + } + // if the pipeline defines a kernel version it must match + // the worker kernel version (e.g. 1709, 1803). + if item.Kernel != "" && item.Kernel != w.kernel { + continue + } } + if len(item.Labels) > 0 || len(w.labels) > 0 { if !checkLabels(item.Labels, w.labels) { continue