mirrors/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2025-04-26 21:44:44 +00:00
Code Issues Projects Releases Wiki Activity

.drone.yml takes precedence over configured path. Allows incremental rollout

Browse source
This commit is contained in:
Laszlo Fogas 2019-06-25 09:46:18 +02:00
parent 844c371f00
commit 84564f9ae5
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
server/configFetcher.go
View file

@ -19,8 +19,17 @@ func (cf *configFetcher) Fetch() ([]*remote.FileMeta, error) {
for i := 0; i < 5; i++ { for i := 0; i < 5; i++ {
select { select {
case <-time.After(time.Second * time.Duration(i)): 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 // 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 { if fileerr == nil {
return []*remote.FileMeta{&remote.FileMeta{ return []*remote.FileMeta{&remote.FileMeta{
Name: cf.repo.Config, Name: cf.repo.Config,