From a4989e383402e5c1af0b9713a3ad4f50ab5581e5 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Wed, 20 Apr 2022 12:30:01 +0200 Subject: [PATCH 1/2] Revert "fix: ensure we're on latest for recipe release dance" This reverts commit 3c4bb6a55e28590c9bcfe0862ffbbfda75ea68cb. --- cli/recipe/sync.go | 5 ----- 1 file changed, 5 deletions(-) diff --git a/cli/recipe/sync.go b/cli/recipe/sync.go index 7464035d..fd6f1af2 100644 --- a/cli/recipe/sync.go +++ b/cli/recipe/sync.go @@ -8,7 +8,6 @@ import ( "coopcloud.tech/abra/cli/internal" "coopcloud.tech/abra/pkg/autocomplete" "coopcloud.tech/abra/pkg/config" - recipePkg "coopcloud.tech/abra/pkg/recipe" "coopcloud.tech/tagcmp" "github.com/AlecAivazis/survey/v2" "github.com/go-git/go-git/v5" @@ -44,10 +43,6 @@ local file system. Action: func(c *cli.Context) error { recipe := internal.ValidateRecipeWithPrompt(c, false) - if err := recipePkg.EnsureUpToDate(recipe.Name); err != nil { - logrus.Fatal(err) - } - mainApp, err := internal.GetMainAppImage(recipe) if err != nil { logrus.Fatal(err) -- 2.40.1 From c7dd6343b18bdcfca2f4620cb6eb00b1560ed136 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Wed, 20 Apr 2022 12:31:21 +0200 Subject: [PATCH 2/2] fix: sync to latest before commits come in Follows from a4989e383402e5c1af0b9713a3ad4f50ab5581e5 --- cli/recipe/upgrade.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cli/recipe/upgrade.go b/cli/recipe/upgrade.go index f6fa259e..baeb0757 100644 --- a/cli/recipe/upgrade.go +++ b/cli/recipe/upgrade.go @@ -61,6 +61,10 @@ You may invoke this command in "wizard" mode and be prompted for input: Action: func(c *cli.Context) error { recipe := internal.ValidateRecipeWithPrompt(c, true) + if err := recipePkg.EnsureUpToDate(recipe.Name); err != nil { + logrus.Fatal(err) + } + bumpType := btoi(internal.Major)*4 + btoi(internal.Minor)*2 + btoi(internal.Patch) if bumpType != 0 { // a bitwise check if the number is a power of 2 -- 2.40.1