Merge branch 'fix-476'
This commit is contained in:
commit
179b66d65c
|
@ -93,6 +93,7 @@ recipes.
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
isLatestHash := false
|
||||||
version := deployedVersion
|
version := deployedVersion
|
||||||
if version == "unknown" && !internal.Chaos {
|
if version == "unknown" && !internal.Chaos {
|
||||||
catl, err := recipe.ReadRecipeCatalogue(conf)
|
catl, err := recipe.ReadRecipeCatalogue(conf)
|
||||||
|
@ -114,6 +115,7 @@ recipes.
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
isLatestHash = true
|
||||||
version = formatter.SmallSHA(head.String())
|
version = formatter.SmallSHA(head.String())
|
||||||
logrus.Warn("no versions detected, using latest commit")
|
logrus.Warn("no versions detected, using latest commit")
|
||||||
if err := recipe.EnsureLatest(app.Recipe, conf); err != nil {
|
if err := recipe.EnsureLatest(app.Recipe, conf); err != nil {
|
||||||
|
@ -129,7 +131,7 @@ recipes.
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if version != "unknown" && !internal.Chaos {
|
if version != "unknown" && !internal.Chaos && !isLatestHash {
|
||||||
if err := recipe.EnsureVersion(app.Recipe, version); err != nil {
|
if err := recipe.EnsureVersion(app.Recipe, version); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue