diff --git a/.release.yml b/.release.yml index c26bd48..27603d4 100644 --- a/.release.yml +++ b/.release.yml @@ -12,8 +12,10 @@ changelog: templatePath: '' release: 'github' assets: - - name: - compress: + - name: ./build/go-semantic-release + compress: false + - name: ./build/go-semantic-release.exe + compress: false github: repo: "go-semantic-release" user: "nightapes" diff --git a/.travis.yml b/.travis.yml index 8de50b9..d43de70 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,9 +27,11 @@ before_script: script: - golangci-lint run ./... - go test -v ./... - - go build -o build/go-semantic-release ./cmd/go-semantic-release/ - - GOOS=windows GOARCH=386 go build -o build/go-semantic-release.exe ./cmd/go-semantic-release/ - + - echo "Building version `./go-semantic-release next`" + - go build -o build/go-semantic-release-temp ./cmd/go-semantic-release/ + - go build -o build/go-semantic-release ./cmd/go-semantic-release/ -ldflags "-X main.minversion `./go-semantic-release next`" + - GOOS=windows GOARCH=386 go build -o build/go-semantic-release.exe -ldflags "-X main.minversion `./go-semantic-release next`" ./cmd/go-semantic-release/ + branches: except: - /^v\d+\.\d+\.\d+$/ \ No newline at end of file diff --git a/cmd/go-semantic-release/commands/release.go b/cmd/go-semantic-release/commands/release.go index 6126c0e..7d981ca 100644 --- a/cmd/go-semantic-release/commands/release.go +++ b/cmd/go-semantic-release/commands/release.go @@ -7,8 +7,6 @@ import ( func init() { rootCmd.AddCommand(releaseCmd) - releaseCmd.Flags().BoolP("force", "f", false, "") - } var releaseCmd = &cobra.Command{ @@ -25,7 +23,7 @@ var releaseCmd = &cobra.Command{ return err } - force, err := cmd.Flags().GetBool("force") + force, err := cmd.Flags().GetBool("no-cache") if err != nil { return err } diff --git a/cmd/go-semantic-release/commands/root.go b/cmd/go-semantic-release/commands/root.go index 5c4ccd0..c193476 100644 --- a/cmd/go-semantic-release/commands/root.go +++ b/cmd/go-semantic-release/commands/root.go @@ -23,7 +23,8 @@ var rootCmd = &cobra.Command{ } //Execute rootCmd -func Execute() { +func Execute(version string) { + rootCmd.Version = version if err := rootCmd.Execute(); err != nil { fmt.Println(err) os.Exit(1) diff --git a/cmd/go-semantic-release/main.go b/cmd/go-semantic-release/main.go index a31920a..24dbfef 100644 --- a/cmd/go-semantic-release/main.go +++ b/cmd/go-semantic-release/main.go @@ -4,6 +4,8 @@ import ( "github.com/Nightapes/go-semantic-release/cmd/go-semantic-release/commands" ) +var version string + func main() { - commands.Execute() + commands.Execute(version) } diff --git a/internal/releaser/github/github.go b/internal/releaser/github/github.go index 23e1dce..ecc5400 100644 --- a/internal/releaser/github/github.go +++ b/internal/releaser/github/github.go @@ -127,7 +127,7 @@ func (g Client) UploadAssets(assets []config.Asset) error { return err } - _, resp, err := g.client.Repositories.UploadReleaseAsset(g.context, g.config.User, g.config.Repo, *g.release.ID, &github.UploadOptions{Name: asset.Name}, file) + _, resp, err := g.client.Repositories.UploadReleaseAsset(g.context, g.config.User, g.config.Repo, *g.release.ID, &github.UploadOptions{Name: file.Name()}, file) if err != nil { return err } diff --git a/internal/releaser/util/util.go b/internal/releaser/util/util.go index e0700ad..cfbf40b 100644 --- a/internal/releaser/util/util.go +++ b/internal/releaser/util/util.go @@ -31,7 +31,7 @@ func GetAccessToken(providerName string) (string, error) { log.Debugf("check if %s environment variable is set", envName) if token, exists = os.LookupEnv(envName); !exists { - return "", fmt.Errorf("Could not find %s in the enviroment variables. Please check if it is set", envName) + return "", fmt.Errorf("could not find %s in the enviroment variables. Please check if it is set", envName) } return token, nil }