Merge branch 'master' into GiteaClient_Add_CreateFile

goreleaser · May 22, 2020 · b2e13d8 · b2e13d8
2 parents bed1af5 + b2b418c
commit b2e13d8
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 13 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -8,13 +8,22 @@ on:
       - 'v*'
   pull_request:
 
+env:
+  TMPDIR: /home/runner/work/_temp/tmp
+
 jobs:
   goreleaser:
     runs-on: ubuntu-latest
     steps:
       -
         name: Checkout
         uses: actions/checkout@v2
+      -
+        name: Prepare
+        run: |
+          # FIXME: Workaround for invalid cross-device link
+          # https://github.com/goreleaser/goreleaser/pull/1545
+          mkdir -p $TMPDIR
       -
         name: Unshallow
         run: git fetch --prune --unshallow

diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -89,6 +89,8 @@ brews:
     description: Deliver Go binaries as fast and easily as possible
     test: |
       system "#{bin}/goreleaser -v"
+    dependencies:
+    - go
 scoop:
   bucket:
     owner: goreleaser

diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/goreleaser/goreleaser
 go 1.14
 
 require (
-	code.gitea.io/sdk/gitea v0.11.3
+	code.gitea.io/sdk/gitea v0.12.0
 	github.com/Masterminds/semver/v3 v3.1.0
 	github.com/apex/log v1.1.4
 	github.com/aws/aws-sdk-go v1.25.11 // indirect

diff --git a/go.sum b/go.sum
@@ -7,8 +7,8 @@ cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6A
 cloud.google.com/go v0.44.3 h1:0sMegbmn/8uTwpNkB0q9cLEpZ2W5a6kl+wtBQgPWBJQ=
 cloud.google.com/go v0.44.3/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
 cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
-code.gitea.io/sdk/gitea v0.11.3 h1:CdI3J82Mqn0mElyEKa5DUSr3Wi2R+qm/6uVtCkSSqSM=
-code.gitea.io/sdk/gitea v0.11.3/go.mod h1:z3uwDV/b9Ls47NGukYM9XhnHtqPh/J+t40lsUrR6JDY=
+code.gitea.io/sdk/gitea v0.12.0 h1:hvDCz4wtFvo7rf5Ebj8tGd4aJ4wLPKX3BKFX9Dk1Pgs=
+code.gitea.io/sdk/gitea v0.12.0/go.mod h1:z3uwDV/b9Ls47NGukYM9XhnHtqPh/J+t40lsUrR6JDY=
 contrib.go.opencensus.io/exporter/aws v0.0.0-20181029163544-2befc13012d0/go.mod h1:uu1P0UCM/6RbsMrgPa98ll8ZcHM858i/AD06a9aLRCA=
 contrib.go.opencensus.io/exporter/ocagent v0.5.0 h1:TKXjQSRS0/cCDrP7KvkgU6SmILtF/yV2TOs/02K/WZQ=
 contrib.go.opencensus.io/exporter/ocagent v0.5.0/go.mod h1:ImxhfLRpxoYiSq891pBrLVhN+qmP8BTVvdH2YLs7Gl0=

diff --git a/internal/builders/golang/build.go b/internal/builders/golang/build.go
@@ -81,7 +81,7 @@ func (*Builder) Build(ctx *context.Context, build config.Build, options api.Opti
 		Goarm:  target.arm,
 		Gomips: target.mips,
 		Extra: map[string]interface{}{
-			"Binary": filepath.Base(options.Path),
+			"Binary": strings.TrimSuffix(filepath.Base(options.Path), options.Ext),
 			"Ext":    options.Ext,
 			"ID":     build.ID,
 		},

diff --git a/internal/builders/golang/build_test.go b/internal/builders/golang/build_test.go
@@ -117,16 +117,15 @@ func TestBuild(t *testing.T) {
 		var ext string
 		if strings.HasPrefix(target, "windows") {
 			ext = ".exe"
-		}
-		if target == "js_wasm" {
+		} else if target == "js_wasm" {
 			ext = ".wasm"
 		}
 		bin, terr := tmpl.New(ctx).Apply(build.Binary)
 		require.NoError(t, terr)
 		var err = Default.Build(ctx, build, api.Options{
 			Target: target,
-			Name:   bin,
-			Path:   filepath.Join(folder, "dist", target, bin),
+			Name:   bin + ext,
+			Path:   filepath.Join(folder, "dist", target, bin+ext),
 			Ext:    ext,
 		})
 		assert.NoError(t, err)
@@ -196,8 +195,8 @@ func TestBuild(t *testing.T) {
 			},
 		},
 		{
-			Name:   "bin/foo-v5.6.7",
-			Path:   filepath.Join(folder, "dist", "windows_amd64", "bin", "foo-v5.6.7"),
+			Name:   "bin/foo-v5.6.7.exe",
+			Path:   filepath.Join(folder, "dist", "windows_amd64", "bin", "foo-v5.6.7.exe"),
 			Goos:   "windows",
 			Goarch: "amd64",
 			Type:   artifact.Binary,
@@ -208,8 +207,8 @@ func TestBuild(t *testing.T) {
 			},
 		},
 		{
-			Name:   "bin/foo-v5.6.7",
-			Path:   filepath.Join(folder, "dist", "js_wasm", "bin", "foo-v5.6.7"),
+			Name:   "bin/foo-v5.6.7.wasm",
+			Path:   filepath.Join(folder, "dist", "js_wasm", "bin", "foo-v5.6.7.wasm"),
 			Goos:   "js",
 			Goarch: "wasm",
 			Type:   artifact.Binary,

diff --git a/internal/client/gitea.go b/internal/client/gitea.go
@@ -128,7 +128,7 @@ func (c *giteaClient) createRelease(ctx *context.Context, title, body string) (*
 }
 
 func (c *giteaClient) getExistingRelease(owner, repoName, tagName string) (*gitea.Release, error) {
-	releases, err := c.client.ListReleases(owner, repoName)
+	releases, err := c.client.ListReleases(owner, repoName, gitea.ListReleasesOptions{})
 	if err != nil {
 		return nil, err
 	}