Skip to content

Commit af2addb

Browse files
authored
Merge pull request #29 from Nightapes/typo
fix(gitutil): fix log message for tags
2 parents 1342714 + 7157d64 commit af2addb

File tree

6 files changed

+88
-12
lines changed

6 files changed

+88
-12
lines changed

.github/workflows/main.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,12 @@ jobs:
3535
- name: Build Docker image
3636
if: github.ref != 'refs/heads/master'
3737
run: |
38-
docker build -t nightapes/go-semantic-release:development .
3938
docker login -u nightapes -p ${{ secrets.DOCKER_PASSWORD }}
39+
docker login -u nightapes -p ${{ secrets.GITHUB_TOKEN }} docker.pkg.github.com
40+
docker build -t nightapes/go-semantic-release:development .
4041
docker push nightapes/go-semantic-release:development
42+
docker tag nightapes/go-semantic-release:development docker.pkg.github.com/nightapes/go-semantic-release/go-semantic-release:development
43+
docker push docker.pkg.github.com/nightapes/go-semantic-release/go-semantic-release:development
4144
4245
- name: Push Docker image
4346
if: github.ref != 'refs/heads/master'
@@ -48,4 +51,5 @@ jobs:
4851
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4952
run: |
5053
docker login -u nightapes -p ${{ secrets.DOCKER_PASSWORD }}
54+
docker login -u nightapes -p $GITHUB_TOKEN docker.pkg.github.com
5155
./build/go-semantic-release-temp release --loglevel trace

.release.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ changelog:
1717
hooks:
1818
preRelease:
1919
- docker build -t nightapes/go-semantic-release:latest .
20-
- docker build -t nightapes/go-semantic-release:$RELEASE_VERSION .
20+
- docker tag nightapes/go-semantic-release:latest docker.pkg.github.com/nightapes/go-semantic-release/go-semantic-release:$RELEASE_VERSION
21+
- docker tag nightapes/go-semantic-release:latest nightapes/go-semantic-release:$RELEASE_VERSION
2122
postRelease:
2223
- docker push nightapes/go-semantic-release:latest
2324
- docker push nightapes/go-semantic-release:$RELEASE_VERSION
25+
- docker push docker.pkg.github.com/nightapes/go-semantic-release/go-semantic-release:$RELEASE_VERSION

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
## Release Types
44

5-
| Type | Implemendet | Git tag | Changelog | Release | Write access git | Api token |
6-
| ---------- | :----------------: | :----------------: | :----------------: | :----------------: | :----------------: | :----------------: |
7-
| `github` | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | | :white_check_mark: |
8-
| `gitlab` | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | | :white_check_mark: |
9-
| `git` | :white_check_mark: | :white_check_mark: | | | :white_check_mark: | |
10-
| `bitbuckt` | Comming soon | :white_check_mark: | | | :white_check_mark: | |
5+
| Type | Implemendet | Git tag | Changelog | Release | Write access git | Api token |
6+
| ----------- | :----------------: | :----------------: | :----------------: | :----------------: | :----------------: | :----------------: |
7+
| `github` | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | | :white_check_mark: |
8+
| `gitlab` | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | | :white_check_mark: |
9+
| `git` | :white_check_mark: | :white_check_mark: | | | :white_check_mark: | |
10+
| `bitbucket` | Comming soon | :white_check_mark: | | | :white_check_mark: | |
1111

1212

1313
## Supported CI Pipelines
Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
package commands
2+
3+
import (
4+
"github.com/Nightapes/go-semantic-release/internal/hooks"
5+
"github.com/Nightapes/go-semantic-release/pkg/semanticrelease"
6+
"github.com/spf13/cobra"
7+
)
8+
9+
func init() {
10+
rootCmd.AddCommand(hooksCmd)
11+
}
12+
13+
var hooksCmd = &cobra.Command{
14+
Use: "hooks",
15+
Short: "Run all hooks",
16+
RunE: func(cmd *cobra.Command, args []string) error {
17+
config, err := cmd.Flags().GetString("config")
18+
if err != nil {
19+
return err
20+
}
21+
22+
repository, err := cmd.Flags().GetString("repository")
23+
if err != nil {
24+
return err
25+
}
26+
27+
force, err := cmd.Flags().GetBool("no-cache")
28+
if err != nil {
29+
return err
30+
}
31+
32+
ignoreConfigChecks, err := cmd.Flags().GetBool("no-checks")
33+
if err != nil {
34+
return err
35+
}
36+
37+
releaseConfig := readConfig(config)
38+
39+
s, err := semanticrelease.New(releaseConfig, repository, !ignoreConfigChecks)
40+
if err != nil {
41+
return err
42+
}
43+
44+
provider, err := s.GetCIProvider()
45+
46+
if err != nil {
47+
return err
48+
}
49+
50+
releaseVersion, err := s.GetNextVersion(provider, force)
51+
if err != nil {
52+
return err
53+
}
54+
55+
hook := hooks.New(releaseConfig, releaseVersion)
56+
57+
err = hook.PreRelease()
58+
if err != nil {
59+
return err
60+
}
61+
62+
return hook.PostRelease()
63+
},
64+
}

internal/gitutil/gitutil.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ func (g *GitUtil) GetLastVersion() (*semver.Version, string, error) {
9090

9191
err = gitTags.ForEach(func(p *plumbing.Reference) error {
9292
v, err := semver.NewVersion(p.Name().Short())
93-
log.Tracef("Tag %+v with hash: %s", p.Target(), p.Hash())
93+
log.Tracef("Tag %+v with hash: %s", p.Name().Short(), p.Hash())
9494

9595
if err == nil {
9696
tags = append(tags, v)

internal/hooks/hooks.go

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package hooks
33
import (
44
"bufio"
55
"os/exec"
6+
"runtime"
67
"strings"
78

89
"github.com/Nightapes/go-semantic-release/internal/shared"
@@ -51,9 +52,14 @@ func (h *Hooks) PostRelease() error {
5152

5253
func (h *Hooks) runCommand(command string) error {
5354

54-
splittedCmd := strings.Split(strings.ReplaceAll(command, "$RELEASE_VERSION", h.version.Next.Version.String()), " ")
55+
cmdReplaced := strings.ReplaceAll(command, "$RELEASE_VERSION", h.version.Next.Version.String())
5556

56-
cmd := exec.Command(splittedCmd[0], splittedCmd[1:]...)
57+
var cmd *exec.Cmd
58+
if runtime.GOOS == "windows" {
59+
cmd = exec.Command("cmd.exe", "/C", cmdReplaced)
60+
} else {
61+
cmd = exec.Command("sh", "-c", cmdReplaced)
62+
}
5763

5864
cmdReader, err := cmd.StdoutPipe()
5965
if err != nil {
@@ -63,7 +69,7 @@ func (h *Hooks) runCommand(command string) error {
6369
scanner := bufio.NewScanner(cmdReader)
6470
go func() {
6571
for scanner.Scan() {
66-
log.WithField("cmd", splittedCmd[0]).Infof("%s\n", scanner.Text())
72+
log.WithField("cmd", strings.Fields(cmdReplaced)[0]).Infof("%s\n", scanner.Text())
6773
}
6874
}()
6975

0 commit comments

Comments
 (0)