XBuildAll expects to publish a mixin (#6)

* XBuildAll expects to publish a mixin Fixes #4 Signed-off-by: Brian DeGeeter <[email protected]> * XBuildAll expects to publish a mixin Fixes #4 Signed-off-by: Brian DeGeeter <[email protected]>
getporter · Apr 11, 2022 · dfcc01a · dfcc01a
1 parent 48da115
commit dfcc01a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/mixins/magefile.go b/mixins/magefile.go
@@ -35,6 +35,7 @@ func (m Magefile) Build() {
 // Cross-compile the mixin before a release
 func (m Magefile) XBuildAll() {
 	releases.XBuildAll(m.Pkg, m.MixinName, m.BinDir)
+	releases.PrepareMixinForPublish(m.MixinName)
 }
 
 // Run unit tests

diff --git a/releases/build.go b/releases/build.go
@@ -85,6 +85,4 @@ func XBuildAll(pkg string, name string, binDir string) {
 	// Copy most recent build into bin/dev so that subsequent build steps can easily find it, not used for publishing
 	os.RemoveAll(filepath.Join(binDir, "dev"))
 	shx.Copy(filepath.Join(binDir, info.Version), filepath.Join(binDir, "dev"), shx.CopyRecursive)
-
-	PrepareMixinForPublish(name)
 }
diff --git a/tools/install_test.go b/tools/install_test.go
@@ -1,15 +1,19 @@
 package tools_test
 
 import (
+	"testing"
+
 	"get.porter.sh/magefiles/tools"
 	"github.com/carolynvs/magex/pkg"
+	"github.com/carolynvs/magex/pkg/gopath"
+	"github.com/carolynvs/magex/xplat"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"testing"
 )
 
 func TestEnsureKind(t *testing.T) {
 	tools.EnsureKind()
+	xplat.PrependPath(gopath.GetGopathBin())
 	found, err := pkg.IsCommandAvailable("kind", tools.DefaultKindVersion, "--version")
 	require.NoError(t, err)
 	assert.True(t, found)