Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion mage/setup/mixins.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,17 @@ func InstallMixins() error {
for _, mixin := range mixins {
mixin := mixin
errG.Go(func() error {
for i := 0; i < 3; i++ {
if err := porter.EnsureMixin(mixin); err == nil {
return nil
}
}
return porter.EnsureMixin(mixin)
})
}
return errG.Wait()
}

func EnsurePorter() {
porter.EnsurePorter()
porter.EnsurePorterAt("v1.2.1")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it worth updating the DefaultPorterVersion variable instead?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dgannon991 Yes we probably should, but it requires the magefiles repository to be updated. I will create a PR for that, but I think it make sense to do it here for now to unblock.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kichristensen Sorry, I know it's my fault, but is it worth changing this to 1.3.0?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dgannon991 Good point :) I have just merged the update to magefiles, with should change the default version to 1.3.0, so this can be removed again, I will do that once the magefiles release have been created

}
6 changes: 5 additions & 1 deletion magefile.go
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,11 @@ func PublishExample(name string) error {
}

fmt.Printf("Publishing example bundle: %s\n", name)
return shx.Command("porter", "publish", registryFlag).CollapseArgs().In(name).RunV()
err = shx.Command("porter", "publish", registryFlag).CollapseArgs().In(name).RunV()
mgx.Must(err)

// Publish with latest tag
return shx.Command("porter", "publish", "--tag", "latest").CollapseArgs().In(name).RunV()
}

// SetupDCO configures your git repository to automatically sign your commits
Expand Down