mirror of
https://github.com/woodpecker-ci/woodpecker.git
synced 2025-03-27 23:02:54 +00:00
.drone.yml takes precedence over configured path. Allows incremental rollout
This commit is contained in:
parent
844c371f00
commit
84564f9ae5
1 changed files with 10 additions and 1 deletions
|
@ -19,8 +19,17 @@ func (cf *configFetcher) Fetch() ([]*remote.FileMeta, error) {
|
|||
for i := 0; i < 5; i++ {
|
||||
select {
|
||||
case <-time.After(time.Second * time.Duration(i)):
|
||||
// .drone.yml takes precedence
|
||||
file, fileerr := cf.remote_.File(cf.user, cf.repo, cf.build, ".drone.yml")
|
||||
if fileerr == nil {
|
||||
return []*remote.FileMeta{&remote.FileMeta{
|
||||
Name: cf.repo.Config,
|
||||
Data: file,
|
||||
}}, nil
|
||||
}
|
||||
|
||||
// either a file
|
||||
file, fileerr := cf.remote_.File(cf.user, cf.repo, cf.build, cf.repo.Config)
|
||||
file, fileerr = cf.remote_.File(cf.user, cf.repo, cf.build, cf.repo.Config)
|
||||
if fileerr == nil {
|
||||
return []*remote.FileMeta{&remote.FileMeta{
|
||||
Name: cf.repo.Config,
|
||||
|
|
Loading…
Reference in a new issue