Merge pull request #145 from CrabHo/feat-matrix-local

Add local matrix builds support
This commit is contained in:
Laszlo Fogas 2020-11-18 09:06:52 +01:00 committed by GitHub
commit 6052ac006b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -2,7 +2,9 @@ package exec
import ( import (
"context" "context"
"fmt"
"io" "io"
"io/ioutil"
"log" "log"
"os" "os"
"path" "path"
@ -19,6 +21,7 @@ import (
"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/frontend/yaml" "github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/frontend/yaml"
"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/frontend/yaml/compiler" "github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/frontend/yaml/compiler"
"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/frontend/yaml/linter" "github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/frontend/yaml/linter"
"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/frontend/yaml/matrix"
"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/interrupt" "github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/interrupt"
"github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/multipart" "github.com/laszlocph/woodpecker/cncd/pipeline/pipeline/multipart"
@ -287,6 +290,34 @@ func exec(c *cli.Context) error {
file = ".drone.yml" file = ".drone.yml"
} }
dat, err := ioutil.ReadFile(file)
if err != nil {
return err
}
axes, err := matrix.ParseString(string(dat))
if err != nil {
return fmt.Errorf("Parse matrix fail")
}
if len(axes) == 0 {
axes = append(axes, matrix.Axis{})
}
for _, axis := range axes {
err := execWithAxis(c, axis)
if err != nil {
return err
}
}
return nil
}
func execWithAxis(c *cli.Context, axis matrix.Axis) error {
file := c.Args().First()
if file == "" {
file = ".drone.yml"
}
metadata := metadataFromContext(c) metadata := metadataFromContext(c)
environ := metadata.Environ() environ := metadata.Environ()
secrets := []compiler.Secret{} secrets := []compiler.Secret{}
@ -301,10 +332,16 @@ func exec(c *cli.Context) error {
}) })
} }
drone_env := make(map[string]string) if len(axis) != 0 {
for k, v := range axis {
environ[k] = v
}
}
droneEnv := make(map[string]string)
for _, env := range c.StringSlice("env") { for _, env := range c.StringSlice("env") {
envs := strings.SplitN(env, "=", 2) envs := strings.SplitN(env, "=", 2)
drone_env[envs[0]] = envs[1] droneEnv[envs[0]] = envs[1]
} }
tmpl, err := envsubst.ParseFile(file) tmpl, err := envsubst.ParseFile(file)
@ -377,9 +414,8 @@ func exec(c *cli.Context) error {
), ),
compiler.WithMetadata(metadata), compiler.WithMetadata(metadata),
compiler.WithSecret(secrets...), compiler.WithSecret(secrets...),
compiler.WithEnviron(drone_env), compiler.WithEnviron(droneEnv),
).Compile(conf) ).Compile(conf)
engine, err := docker.NewEnv() engine, err := docker.NewEnv()
if err != nil { if err != nil {
return err return err