mirrors/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2024-09-29 15:01:59 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1974 from appleboy/matrix

Browse source 
fix: missing matrix env.
This commit is contained in:
Brad Rydzewski 2017-03-21 23:22:24 +08:00 committed by GitHub
commit e5e965b797
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
server/hook.go
View file

@ -422,6 +422,10 @@ func (b *builder) Build() ([]*buildItem, error) {
environ[k] = v
}
for k, v := range axis {
environ[k] = v
}
secrets := map[string]string{}
for _, sec := range b.Secs {
if !sec.MatchEvent(b.Curr.Event) {
@ -439,9 +443,11 @@ func (b *builder) Build() ([]*buildItem, error) {
}
y := b.Yaml
if s, err := envsubst.Eval(y, sub); err != nil {
y = s
s, err := envsubst.Eval(y, sub)
if err != nil {
return nil, err
}
y = s
parsed, err := yaml.ParseString(y)
if err != nil {