Skip to content

Commit 00c4e90

Browse files
author
Tobias Meinhardt
committed
Merge branch 'master' of github.com:meinto/git-semver
2 parents 766351c + 4792adc commit 00c4e90

File tree

4 files changed

+21
-12
lines changed

4 files changed

+21
-12
lines changed

.goreleaser.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ archive:
2020
replacements:
2121
386: i386
2222
amd64: x86_64
23+
format_overrides:
24+
- goos: windows
25+
format: zip
2326
brew:
2427
github:
2528
owner: meinto

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.1.16
1+
4.2.0

formula/git-semver.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
class GitSemver < Formula
33
desc ""
44
homepage ""
5-
url "https://github.com/meinto/git-semver/releases/download/v4.1.14/semver_4.1.14_darwin_x86_64.tar.gz"
6-
version "4.1.14"
7-
sha256 "7c0c5f65706abe1483cb967f78b41fb1a25710d73c54ac0c7c4831f0dffb4c66"
5+
url "https://github.com/meinto/git-semver/releases/download/v4.2.0/semver_4.2.0_darwin_x86_64.tar.gz"
6+
version "4.2.0"
7+
sha256 "b84d14e1be201e1e6b0d39458a688450f976d4a2b7ec73b079be276ca4f4b5be"
88

99
depends_on "git"
1010

pkg/cli/cmd/root.go

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,20 @@ var rootCmd = &cobra.Command{
5454
},
5555
Run: func(cmd *cobra.Command, args []string) {
5656

57-
g := git.NewGitService(viper.GetString("gitPath"))
58-
repoPath, err := g.GitRepoPath()
59-
if err != nil {
60-
log.Fatal(err)
61-
}
57+
var g git.Service
58+
var fs file.VersionFileService
59+
var repoPath string
60+
if rootCmdFlags.push || rootCmdFlags.createTag {
61+
g = git.NewGitService(viper.GetString("gitPath"))
62+
rp, err := g.GitRepoPath()
63+
if err != nil {
64+
log.Fatal(err)
65+
}
66+
repoPath = rp
6267

63-
versionFilepath := repoPath + "/" + viper.GetString("versionFile")
64-
fs := file.NewVersionFileService(versionFilepath)
68+
versionFilepath := repoPath + "/" + viper.GetString("versionFile")
69+
fs = file.NewVersionFileService(versionFilepath)
70+
}
6571

6672
if rootCmdFlags.push {
6773
g.AddVersionChanges(viper.GetString("versionFile"))
@@ -88,7 +94,7 @@ var rootCmd = &cobra.Command{
8894
}
8995

9096
if !rootCmdFlags.createTag && !rootCmdFlags.push {
91-
box := packr.NewBox(repoPath + "/buildAssets")
97+
box := packr.NewBox("../../../buildAssets")
9298
version, err := box.FindString("VERSION")
9399
if err != nil {
94100
log.Fatal(err)

0 commit comments

Comments
 (0)