fix: check out default branch from tags
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
Also fix error handling to match function signatures.
This commit is contained in:
parent
5da4afa0ec
commit
09ac74d205
|
@ -138,7 +138,7 @@ keys configured on your account.
|
||||||
internal.RegistryPassword,
|
internal.RegistryPassword,
|
||||||
)
|
)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Warn(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
features, category, err := recipe.GetRecipeFeaturesAndCategory(recipeMeta.Name)
|
features, category, err := recipe.GetRecipeFeaturesAndCategory(recipeMeta.Name)
|
||||||
|
|
|
@ -355,7 +355,7 @@ func EnsureLatest(recipeName string) error {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
branch, err := gitPkg.GetCurrentBranch(repo)
|
branch, err := GetDefaultBranch(repo, recipeName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
@ -935,7 +935,7 @@ func GetRecipeVersions(recipeName, registryUsername, registryPassword string) (R
|
||||||
|
|
||||||
worktree, err := repo.Worktree()
|
worktree, err := repo.Worktree()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
return versions, err
|
||||||
}
|
}
|
||||||
|
|
||||||
gitTags, err := repo.Tags()
|
gitTags, err := repo.Tags()
|
||||||
|
@ -967,7 +967,7 @@ func GetRecipeVersions(recipeName, registryUsername, registryPassword string) (R
|
||||||
|
|
||||||
cl, err := client.New("default") // only required for docker.io registry calls
|
cl, err := client.New("default") // only required for docker.io registry calls
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
queryCache := make(map[reference.Named]string)
|
queryCache := make(map[reference.Named]string)
|
||||||
|
|
Loading…
Reference in New Issue