commit b245d4d7d85d9f84ced320e5a3856aa8af2f1746 · kot.pink/core

+2 -2

.tangled/workflows/test.yaml .tangled/workflows/test.yml

···

       1
       1
        
       when:

     

       2
       2
       -
         - event: push

     

       3
       3
       -
           branch: master

     

       2
       2
       +
         - event: ["push"]

     

       3
       3
       +
           branch: ["master", "test-ci"]

     

       4
       4
        
       

     

       5
       5
        
       dependencies:

     

       6
       6
        
         nixpkgs:

+1 -1

spindle/models/pipeline.go

···

       68
       68
        
       		setup := &setupSteps{}

     

       69
       69
        
       

     

       70
       70
        
       		setup.addStep(nixConfStep())

     

       71
       71
       -
       		setup.addStep(cloneStep(*twf, *pl.TriggerMetadata.Repo, cfg.Server.Dev))

     

       71
       71
       +
       		setup.addStep(cloneStep(*twf, *pl.TriggerMetadata, cfg.Server.Dev))

     

       72
       72
        
       		setup.addStep(checkoutStep(*twf, *pl.TriggerMetadata))

     

       73
       73
        
       		// this step could be empty

     

       74
       74
        
       		if s := dependencyStep(*twf); s != nil {

+23 -4

spindle/models/setup_steps.go

···

       5
       5
        
       	"path"

     

       6
       6
        
       	"strings"

     

       7
       7
        
       

     

       8
       8
       +
       	"github.com/go-git/go-git/v5/plumbing"

     

       8
       9
        
       	"tangled.sh/tangled.sh/core/api/tangled"

     

       10
       10
       +
       	"tangled.sh/tangled.sh/core/workflow"

     

       9
       11
        
       )

     

       10
       12
        
       

     

       11
       13
        
       func nixConfStep() Step {

     
···

       45
       47
        
       

     

       46
       48
        
       // cloneOptsAsSteps processes clone options and adds corresponding steps

     

       47
       49
        
       // to the beginning of the workflow's step list if cloning is not skipped.

     

       48
       48
       -
       func cloneStep(twf tangled.Pipeline_Workflow, tr tangled.Pipeline_TriggerRepo, dev bool) Step {

     

       50
       50
       +
       func cloneStep(twf tangled.Pipeline_Workflow, tr tangled.Pipeline_TriggerMetadata, dev bool) Step {

     

       49
       51
        
       	if twf.Clone.Skip {

     

       50
       52
        
       		return Step{}

     

       51
       53
        
       	}

     
···

       53
       55
        
       	uri := "https://"

     

       54
       56
        
       	if dev {

     

       55
       57
        
       		uri = "http://"

     

       56
       56
       -
       		tr.Knot = strings.ReplaceAll(tr.Knot, "localhost", "host.docker.internal")

     

       58
       58
       +
       		tr.Repo.Knot = strings.ReplaceAll(tr.Repo.Knot, "localhost", "host.docker.internal")

     

       57
       59
        
       	}

     

       58
       60
        
       

     

       59
       59
       -
       	cloneUrl := uri + path.Join(tr.Knot, tr.Did, tr.Repo)

     

       61
       61
       +
       	cloneUrl := uri + path.Join(tr.Repo.Knot, tr.Repo.Did, tr.Repo.Repo)

     

       60
       62
        
       	cloneCmd := []string{"git", "clone", cloneUrl, "."}

     

       61
       63
        
       

     

       62
       64
        
       	// default clone depth is 1

     
···

       64
       66
        
       	if twf.Clone.Depth > 1 {

     

       65
       67
        
       		cloneDepth = int(twf.Clone.Depth)

     

       66
       68
        
       	}

     

       67
       67
       -
       	cloneCmd = append(cloneCmd, []string{"--depth", fmt.Sprintf("%d", cloneDepth)}...)

     

       69
       69
       +
       	cloneCmd = append(cloneCmd, fmt.Sprintf("--depth=%d", cloneDepth))

     

       70
       70
       +
       

     

       71
       71
       +
       	// select the clone branch

     

       72
       72
       +
       	cloneBranch := ""

     

       73
       73
       +
       	switch tr.Kind {

     

       74
       74
       +
       	case workflow.TriggerKindManual:

     

       75
       75
       +
       		// TODO: unimplemented

     

       76
       76
       +
       	case workflow.TriggerKindPush:

     

       77
       77
       +
       		ref := tr.Push.Ref

     

       78
       78
       +
       		refName := plumbing.ReferenceName(ref)

     

       79
       79
       +
       		cloneBranch = refName.Short()

     

       80
       80
       +
       	case workflow.TriggerKindPullRequest:

     

       81
       81
       +
       		cloneBranch = tr.PullRequest.SourceBranch

     

       82
       82
       +
       	}

     

       83
       83
       +
       

     

       84
       84
       +
       	if cloneBranch != "" {

     

       85
       85
       +
       		cloneCmd = append(cloneCmd, fmt.Sprintf("--branch=%s", cloneBranch))

     

       86
       86
       +
       	}

     

       68
       87
        
       

     

       69
       88
        
       	if twf.Clone.Submodules {

     

       70
       89
        
       		cloneCmd = append(cloneCmd, "--recursive")

-2

workflow/def.go

···

       127
       127
        
       	if refName.IsBranch() {

     

       128
       128
        
       		return slices.Contains(c.Branch, refName.Short())

     

       129
       129
        
       	}

     

       130
       130
       -
       	fmt.Println("no", c.Branch, refName.Short())

     

       131
       131
       -
       

     

       132
       130
        
       	return false

     

       133
       131
        
       }

     

       134
       132