fix: replace delivery contract on import branch
This commit is contained in:
parent
8e4672010b
commit
50989db2fe
|
|
@ -465,9 +465,6 @@ func (rm *RepoManager) PublishDeliveryBranch(sourceDir, sourceBranch, repoURL, d
|
||||||
if err := runGit("", os.Environ(), "clone", "--no-local", "--branch", sourceBranch, sourceDir, temporary); err != nil {
|
if err := runGit("", os.Environ(), "clone", "--no-local", "--branch", sourceBranch, sourceDir, temporary); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if err := generate(temporary); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
cleanupAskPass, environment, err := rm.gitEnvironment()
|
cleanupAskPass, environment, err := rm.gitEnvironment()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
|
@ -476,6 +473,12 @@ func (rm *RepoManager) PublishDeliveryBranch(sourceDir, sourceBranch, repoURL, d
|
||||||
if err := runGit(temporary, environment, "checkout", "-B", deliveryBranch); err != nil {
|
if err := runGit(temporary, environment, "checkout", "-B", deliveryBranch); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
if err := os.RemoveAll(filepath.Join(temporary, ".tekton")); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if err := generate(temporary); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
if err := runGit(temporary, environment, "add", ".tekton"); err != nil {
|
if err := runGit(temporary, environment, "add", ".tekton"); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue