Merge pull request #46 from carolynvs/gh-releases

Publish to GH

Author: carolynvs

.gitignore

@@ -1,3 +1,4 @@
 /bin
 /azure
 *-packr.go
+/build/git_askpass.sh

Makefile

@@ -75,19 +75,7 @@ ifndef HAS_JSONPP
 endif
 
 publish: bin/porter$(FILE_EXT)
-	# AZURE_STORAGE_CONNECTION_STRING will be used for auth in the following commands
-	if [[ "$(PERMALINK)" == "latest" ]]; then \
-		az storage blob upload-batch -d porter/mixins/$(MIXIN)/$(VERSION) -s $(BINDIR)/$(VERSION); \
-		az storage blob upload-batch -d porter/mixins/$(MIXIN)/$(PERMALINK) -s $(BINDIR)/$(VERSION); \
-	else \
-		mv $(BINDIR)/$(VERSION) $(BINDIR)/$(PERMALINK); \
-		az storage blob upload-batch -d porter/mixins/$(MIXIN)/$(PERMALINK) -s $(BINDIR)/$(PERMALINK); \
-	fi
-
-	# Generate the mixin feed
-	az storage blob download -c porter -n atom.xml -f bin/atom.xml
-	bin/porter mixins feed generate -d bin/mixins -f bin/atom.xml -t build/atom-template.xml
-	az storage blob upload -c porter -n atom.xml -f bin/atom.xml
+	go run mage.go Publish $(MIXIN) $(VERSION) $(PERMALINK)
 
 bin/porter$(FILE_EXT):
 	curl -fsSLo bin/porter$(FILE_EXT) https://cdn.porter.sh/canary/porter-$(CLIENT_PLATFORM)-$(CLIENT_ARCH)$(FILE_EXT)

azure-pipelines.yml

@@ -7,7 +7,7 @@ trigger:
   branches:
     include:
       - refs/heads/main
-      - refs/tags/*
+      - refs/tags/v*
 
 pool:
   vmImage: 'Ubuntu 16.04'
@@ -26,16 +26,15 @@ steps:
 
 - script: |
     make build test
-  workingDirectory: '$(System.DefaultWorkingDirectory)'
   displayName: 'Unit Test'
 
 - script: |
     make xbuild-all
-  workingDirectory: '$(System.DefaultWorkingDirectory)'
   displayName: 'Cross Compile'
 
 - script: |
-    AZURE_STORAGE_CONNECTION_STRING=$(AZURE_STORAGE_CONNECTION_STRING) make publish
-  workingDirectory: '$(System.DefaultWorkingDirectory)'
+    make publish
+  env:
+    GITHUB_TOKEN: $(GITHUB_TOKEN)
   displayName: 'Publish'
   condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))

go.mod

@@ -3,7 +3,7 @@ module get.porter.sh/mixin/arm
 go 1.13
 
 require (
-	get.porter.sh/porter v0.22.1-beta.1
+	get.porter.sh/porter v0.37.2
 	github.com/Azure/azure-sdk-for-go v38.2.0+incompatible
 	github.com/Azure/go-autorest v12.2.0+incompatible
 	github.com/Azure/go-autorest/autorest v0.9.0
@@ -12,13 +12,14 @@ require (
 	github.com/Azure/go-autorest/autorest/validation v0.2.0 // indirect
 	github.com/Masterminds/goutils v1.1.0 // indirect
 	github.com/Masterminds/sprig v2.22.0+incompatible
-	github.com/gobuffalo/packr/v2 v2.7.1
+	github.com/gobuffalo/envy v1.7.1 // indirect
+	github.com/gobuffalo/packr/v2 v2.8.0
 	github.com/huandu/xstrings v1.3.0 // indirect
 	github.com/kelseyhightower/envconfig v1.4.0
 	github.com/mitchellh/copystructure v1.0.0 // indirect
-	github.com/pkg/errors v0.8.1
-	github.com/spf13/cobra v0.0.5
-	github.com/stretchr/testify v1.4.0
+	github.com/pkg/errors v0.9.1
+	github.com/spf13/cobra v1.0.0
+	github.com/stretchr/testify v1.6.1
 	gopkg.in/yaml.v2 v2.2.4
 )
 

go.sum

@@ -0,0 +1,14 @@
+// +build ignore
+
+package main
+
+import (
+	"os"
+
+	"github.com/magefile/mage/mage"
+)
+
+// This file allows someone to run mage commands without mage installed
+// by running `go run mage.go TARGET`.
+// See https://magefile.org/zeroinstall/
+func main() { os.Exit(mage.Main()) }

mage.go

@@ -0,0 +1,17 @@
+// +build mage
+
+package main
+
+import (
+	// mage:import
+	"get.porter.sh/porter/mage/releases"
+)
+
+// We are migrating to mage, but for now keep using make as the main build script interface.
+
+// Publish the cross-compiled binaries.
+func Publish(mixin string, version string, permalink string) {
+	releases.PrepareMixinForPublish(mixin, version, permalink)
+	releases.PublishMixin(mixin, version, permalink)
+	releases.PublishMixinFeed(mixin, version)
+}

magefile.go

@@ -3,13 +3,14 @@ package arm
 import (
 	"get.porter.sh/mixin/arm/pkg"
 	"get.porter.sh/porter/pkg/mixin"
+	"get.porter.sh/porter/pkg/pkgmgmt"
 	"get.porter.sh/porter/pkg/porter/version"
 )
 
 func (m *Mixin) PrintVersion(opts version.Options) error {
 	metadata := mixin.Metadata{
 		Name: "arm",
-		VersionInfo: mixin.VersionInfo{
+		VersionInfo: pkgmgmt.VersionInfo{
 			Version: pkg.Version,
 			Commit:  pkg.Commit,
 			Author:  "Porter Authors",