toolshed/abra
4
3
Fork 18
Code Issues 31 Pull Requests 1 Packages Releases 41 Activity

fix: check out default branch from tags
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source 
Also fix error handling to match function signatures.
This commit is contained in:
decentral1se
2022-02-18 11:17:43 +01:00
parent 5da4afa0ec
commit 09ac74d205
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cli/catalogue/catalogue.go
View File

@ -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)

6
pkg/recipe/recipe.go
View File

@ -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)