Compare commits

..

18 Commits

Author SHA1 Message Date
Sebastian
af5c8f5ae3 Merge pull request #32 from Nightapes/fix.beta-release
fix(prerelease): calculate right version if branch is set to alpha,beta or rc
2020-01-26 17:11:49 +01:00
Nightapes
c361744a35 fix(prerelease): calculate right version if branch is set to alpha,beta or rc 2020-01-26 17:08:57 +01:00
Felix Wiedmann
6a375f3bab Merge pull request #30 from jthurman42/jthurman/optional-scope
Only print scope if one was defined
2020-01-15 22:58:50 +01:00
Jonathan Thurman
d4627a9d46 fix(internal/changelog): Only print scope if one was defined 2020-01-14 19:35:54 -08:00
Felix Wiedmann
af2addbffd Merge pull request #29 from Nightapes/typo
fix(gitutil): fix log message for tags
2020-01-08 22:49:28 +01:00
Nightapes
7157d64b7b style(hooks): fix lint issues 2020-01-06 17:45:52 +01:00
Nightapes
575ba5d5bd fix(hooks): improve cmd execution 2020-01-06 17:41:10 +01:00
Nightapes
a8b68f9182 build(docker): fix github naming 2020-01-06 12:51:01 +01:00
Nightapes
f6a2d837b1 buikd(docker): add github docker registy 2020-01-06 12:47:02 +01:00
Nightapes
279509c922 docs(README): fix typo 2020-01-06 12:44:10 +01:00
Nightapes
d0035d6bca fix(gitutil): fix log message for tags 2020-01-06 12:14:41 +01:00
Felix Wiedmann
1342714579 Merge pull request #28 from Nightapes/git_provider
Git provider and hooks
2020-01-05 21:38:10 +01:00
Nightapes
d92438b339 test(hooks): fix testing 2020-01-05 19:10:07 +01:00
Nightapes
aff2203d66 style(github): fix lint issues 2020-01-05 19:06:15 +01:00
Nightapes
113ddf2b1f build(ci): use new hooks for docker release 2020-01-05 19:02:20 +01:00
Nightapes
8e3c446605 docs(README): add hooks 2020-01-05 18:56:37 +01:00
Nightapes
8ea92efb90 feat(hooks): add pre and post release hooks 2020-01-05 18:56:37 +01:00
Nightapes
42fc522a43 feat(releaser): add git only as releaser, will create a new tag with version only 2020-01-05 18:55:47 +01:00
30 changed files with 709 additions and 244 deletions

View File

@@ -1,68 +1,55 @@
name: Go name: Go
on: [push, pull_request] on: [push, pull_request]
jobs: jobs:
build: build:
name: Build name: Build
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Set up Go 1.13
- name: Set up Go 1.13 uses: actions/setup-go@v1
uses: actions/setup-go@v1 with:
with: go-version: 1.13
go-version: 1.13 id: go
id: go
- name: Check out code into the Go module directory - name: Check out code into the Go module directory
uses: actions/checkout@v1 uses: actions/checkout@v1
- name: Lint - name: Lint
run: | run: |
export PATH=$PATH:$(go env GOPATH)/bin export PATH=$PATH:$(go env GOPATH)/bin
curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.18.0 curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.18.0
golangci-lint run ./... golangci-lint run ./...
- name: Run tests - name: Run tests
run: go test ./... run: go test ./...
- name: Build binary - name: Build binary
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: | run: |
go build -o build/go-semantic-release-temp ./cmd/go-semantic-release/ go build -o build/go-semantic-release-temp ./cmd/go-semantic-release/
./build/go-semantic-release-temp next --no-cache --loglevel trace ./build/go-semantic-release-temp next --no-cache --loglevel trace
GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o build/go-semantic-release -ldflags "-w -s --X main.version=`./build/go-semantic-release-temp next`" ./cmd/go-semantic-release/ GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o build/go-semantic-release -ldflags "-w -s --X main.version=`./build/go-semantic-release-temp next`" ./cmd/go-semantic-release/
GOOS=windows GOARCH=386 CGO_ENABLED=0 go build -o build/go-semantic-release.exe -ldflags "-w -s -X main.version=`./build/go-semantic-release-temp next`" ./cmd/go-semantic-release/ GOOS=windows GOARCH=386 CGO_ENABLED=0 go build -o build/go-semantic-release.exe -ldflags "-w -s -X main.version=`./build/go-semantic-release-temp next`" ./cmd/go-semantic-release/
- name: Build Docker image for master - name: Build Docker image
env: if: github.ref != 'refs/heads/master'
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: |
if: github.ref == 'refs/heads/master' docker login -u nightapes -p ${{ secrets.DOCKER_PASSWORD }}
run: | docker login -u nightapes -p ${{ secrets.GITHUB_TOKEN }} docker.pkg.github.com
docker build -t nightapes/go-semantic-release:latest . docker build -t nightapes/go-semantic-release:development .
docker build -t nightapes/go-semantic-release:"$(./build/go-semantic-release next)" . docker push nightapes/go-semantic-release:development
docker tag nightapes/go-semantic-release:development docker.pkg.github.com/nightapes/go-semantic-release/go-semantic-release:development
docker push docker.pkg.github.com/nightapes/go-semantic-release/go-semantic-release:development
- name: Push Docker image for master - name: Push Docker image
env: if: github.ref != 'refs/heads/master'
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: |
if: github.ref == 'refs/heads/master'
run: |
docker login -u nightapes -p ${{ secrets.DOCKER_PASSWORD }}
docker push nightapes/go-semantic-release:latest
docker push nightapes/go-semantic-release:"$(./build/go-semantic-release next)"
- name: Build Docker image - name: Release
if: github.ref != 'refs/heads/master' env:
run: | GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
docker build -t nightapes/go-semantic-release:development . run: |
docker login -u nightapes -p ${{ secrets.DOCKER_PASSWORD }}
- name: Push Docker image docker login -u nightapes -p $GITHUB_TOKEN docker.pkg.github.com
if: github.ref != 'refs/heads/master' ./build/go-semantic-release-temp release --loglevel trace
run: |
docker login -u nightapes -p ${{ secrets.DOCKER_PASSWORD }}
docker push nightapes/go-semantic-release:development
- name: Release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: ./build/go-semantic-release-temp release --loglevel trace

View File

@@ -1,16 +1,26 @@
release: 'github' release: "github"
github: github:
repo: "go-semantic-release" repo: "go-semantic-release"
user: "nightapes" user: "nightapes"
commitFormat: angular commitFormat: angular
branch: branch:
master: release master: release
assets: beta: beta
- name: ./build/go-semantic-release assets:
compress: false - name: ./build/go-semantic-release
- name: ./build/go-semantic-release.exe compress: false
compress: false - name: ./build/go-semantic-release.exe
changelog: compress: false
docker: changelog:
latest: true docker:
repository: "nightapes/go-semantic-release" latest: true
repository: "nightapes/go-semantic-release"
hooks:
preRelease:
- docker build -t nightapes/go-semantic-release:latest .
- docker tag nightapes/go-semantic-release:latest docker.pkg.github.com/nightapes/go-semantic-release/go-semantic-release:$RELEASE_VERSION
- docker tag nightapes/go-semantic-release:latest nightapes/go-semantic-release:$RELEASE_VERSION
postRelease:
- docker push nightapes/go-semantic-release:latest
- docker push nightapes/go-semantic-release:$RELEASE_VERSION
- docker push docker.pkg.github.com/nightapes/go-semantic-release/go-semantic-release:$RELEASE_VERSION

View File

@@ -2,12 +2,12 @@
## Release Types ## Release Types
| Type | Implemendet | Git tag | Changelog | Release | Write access git | Api token | | Type | Implemendet | Git tag | Changelog | Release | Write access git | Api token |
| ---------- | :----------------: | :----------------: | :----------------: | :----------------: | :----------------: | :----------------: | | ----------- | :----------------: | :----------------: | :----------------: | :----------------: | :----------------: | :----------------: |
| `github` | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | | :white_check_mark: | | `github` | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | | :white_check_mark: |
| `gitlab` | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | | :white_check_mark: | | `gitlab` | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | | :white_check_mark: |
| `git` | Comming soon | :white_check_mark: | | | :white_check_mark: | | | `git` | :white_check_mark: | :white_check_mark: | | | :white_check_mark: | |
| `bitbuckt` | Comming soon | :white_check_mark: | | | :white_check_mark: | | | `bitbucket` | Comming soon | :white_check_mark: | | | :white_check_mark: | |
## Supported CI Pipelines ## Supported CI Pipelines
@@ -37,6 +37,11 @@ assets:
compress: false compress: false
- name: ./build/go-semantic-release.exe - name: ./build/go-semantic-release.exe
compress: false compress: false
hooks:
preRelease:
- name: echo $RELEASE_VERSION
postRelease:
- name: echo $RELEASE_VERSION
``` ```
#### CommitFormat #### CommitFormat
@@ -65,7 +70,7 @@ branch:
<branch-name>: <kind> <branch-name>: <kind>
``` ```
#### Relase #### Release
At the moment we support releases to gitlab and github. At the moment we support releases to gitlab and github.
@@ -95,6 +100,20 @@ gitlab:
customUrl: <https://your.gitlab> customUrl: <https://your.gitlab>
``` ```
##### Git only
Only via https at the moment. You need write access to your git repository
```yml
release: 'git'
git:
email: "<email>" # Used for creating tag
user: "<user>" : # Used for creating tag and pushing
auth: "<token>" # Used for pushing, can be env "$GIT_TOKEN", will be replaced with env
```
#### Assets #### Assets
You can upload assets to a release You can upload assets to a release
@@ -108,6 +127,10 @@ assets:
compress: false compress: false
``` ```
#### Hooks
Hooks will run when calling `release`. Hooks run only if a release will be triggered.
#### Changelog #### Changelog
Following variables can be used for templates: Following variables can be used for templates:

View File

@@ -35,7 +35,12 @@ var changelogCmd = &cobra.Command{
return err return err
} }
s, err := semanticrelease.New(readConfig(config), repository) ignoreConfigChecks, err := cmd.Flags().GetBool("no-checks")
if err != nil {
return err
}
s, err := semanticrelease.New(readConfig(config), repository, !ignoreConfigChecks)
if err != nil { if err != nil {
return err return err
} }

View File

@@ -0,0 +1,64 @@
package commands
import (
"github.com/Nightapes/go-semantic-release/internal/hooks"
"github.com/Nightapes/go-semantic-release/pkg/semanticrelease"
"github.com/spf13/cobra"
)
func init() {
rootCmd.AddCommand(hooksCmd)
}
var hooksCmd = &cobra.Command{
Use: "hooks",
Short: "Run all hooks",
RunE: func(cmd *cobra.Command, args []string) error {
config, err := cmd.Flags().GetString("config")
if err != nil {
return err
}
repository, err := cmd.Flags().GetString("repository")
if err != nil {
return err
}
force, err := cmd.Flags().GetBool("no-cache")
if err != nil {
return err
}
ignoreConfigChecks, err := cmd.Flags().GetBool("no-checks")
if err != nil {
return err
}
releaseConfig := readConfig(config)
s, err := semanticrelease.New(releaseConfig, repository, !ignoreConfigChecks)
if err != nil {
return err
}
provider, err := s.GetCIProvider()
if err != nil {
return err
}
releaseVersion, err := s.GetNextVersion(provider, force)
if err != nil {
return err
}
hook := hooks.New(releaseConfig, releaseVersion)
err = hook.PreRelease()
if err != nil {
return err
}
return hook.PostRelease()
},
}

View File

@@ -30,7 +30,12 @@ var nextCmd = &cobra.Command{
return err return err
} }
s, err := semanticrelease.New(readConfig(config), repository) ignoreConfigChecks, err := cmd.Flags().GetBool("no-checks")
if err != nil {
return err
}
s, err := semanticrelease.New(readConfig(config), repository, !ignoreConfigChecks)
if err != nil { if err != nil {
return err return err
} }

View File

@@ -28,7 +28,12 @@ var releaseCmd = &cobra.Command{
return err return err
} }
s, err := semanticrelease.New(readConfig(config), repository) ignoreConfigChecks, err := cmd.Flags().GetBool("no-checks")
if err != nil {
return err
}
s, err := semanticrelease.New(readConfig(config), repository, !ignoreConfigChecks)
if err != nil { if err != nil {
return err return err
} }

View File

@@ -35,6 +35,7 @@ func init() {
rootCmd.PersistentFlags().StringP("loglevel", "l", "error", "Set loglevel") rootCmd.PersistentFlags().StringP("loglevel", "l", "error", "Set loglevel")
rootCmd.PersistentFlags().StringP("config", "c", ".release.yml", "Path to config file") rootCmd.PersistentFlags().StringP("config", "c", ".release.yml", "Path to config file")
rootCmd.PersistentFlags().Bool("no-cache", false, "Ignore cache, don't use in ci build") rootCmd.PersistentFlags().Bool("no-cache", false, "Ignore cache, don't use in ci build")
rootCmd.PersistentFlags().Bool("no-checks", false, "Ignore missing values and envs")
} }
func readConfig(file string) *config.ReleaseConfig { func readConfig(file string) *config.ReleaseConfig {

View File

@@ -26,7 +26,12 @@ var setCmd = &cobra.Command{
return err return err
} }
s, err := semanticrelease.New(readConfig(config), repository) ignoreConfigChecks, err := cmd.Flags().GetBool("no-checks")
if err != nil {
return err
}
s, err := semanticrelease.New(readConfig(config), repository, !ignoreConfigChecks)
if err != nil { if err != nil {
return err return err
} }

View File

@@ -23,7 +23,12 @@ var zipCmd = &cobra.Command{
return err return err
} }
s, err := semanticrelease.New(readConfig(config), repository) ignoreConfigChecks, err := cmd.Flags().GetBool("no-checks")
if err != nil {
return err
}
s, err := semanticrelease.New(readConfig(config), repository, !ignoreConfigChecks)
if err != nil { if err != nil {
return err return err
} }

5
go.sum
View File

@@ -55,6 +55,7 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY=
github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
@@ -62,6 +63,7 @@ github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQz
github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
github.com/pelletier/go-buffruneio v0.2.0 h1:U4t4R6YkofJ5xHm3dJzuRpPZ0mr5MMCoAWooScCR7aA= github.com/pelletier/go-buffruneio v0.2.0 h1:U4t4R6YkofJ5xHm3dJzuRpPZ0mr5MMCoAWooScCR7aA=
github.com/pelletier/go-buffruneio v0.2.0/go.mod h1:JkE26KsDizTr40EUHkXVtNPvgGtbSNq5BcowyYOWdKo= github.com/pelletier/go-buffruneio v0.2.0/go.mod h1:JkE26KsDizTr40EUHkXVtNPvgGtbSNq5BcowyYOWdKo=
github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc=
github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -72,14 +74,17 @@ github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=
github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4= github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI=
github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8= github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8=
github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s= github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s=
github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk=
github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
github.com/spf13/viper v1.3.2 h1:VUFqw5KcqRf7i70GOzW7N+Q7+gxVBkSSqiXB12+JQ4M=
github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
github.com/src-d/gcfg v1.4.0 h1:xXbNR5AlLSA315x2UO+fTSSAXCDf+Ar38/6oyGbDKQ4= github.com/src-d/gcfg v1.4.0 h1:xXbNR5AlLSA315x2UO+fTSSAXCDf+Ar38/6oyGbDKQ4=
github.com/src-d/gcfg v1.4.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI= github.com/src-d/gcfg v1.4.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI=

View File

@@ -63,7 +63,7 @@ func TestWriteAndReadCache(t *testing.T) {
Author: "Author", Author: "Author",
Hash: "Hash", Hash: "Hash",
}, },
ParsedMessage: "add gitlab as relase option", ParsedMessage: "add gitlab as release option",
Scope: "releaser", Scope: "releaser",
ParsedBreakingChangeMessage: "", ParsedBreakingChangeMessage: "",
Tag: "feat", Tag: "feat",

View File

@@ -19,9 +19,9 @@ func New() *Calculator {
} }
//IncPrerelease increase prerelease by one //IncPrerelease increase prerelease by one
func (c *Calculator) IncPrerelease(preReleaseType string, version *semver.Version) (semver.Version, error) { func (c *Calculator) IncPrerelease(preReleaseType string, version semver.Version) (semver.Version, error) {
defaultPrerelease := preReleaseType + ".0" defaultPrerelease := preReleaseType + ".0"
if version.Prerelease() == "" || !strings.HasPrefix(version.Prerelease(), preReleaseType) { if !c.hasPrerelease(version, preReleaseType) {
return version.SetPrerelease(defaultPrerelease) return version.SetPrerelease(defaultPrerelease)
} }
@@ -32,19 +32,31 @@ func (c *Calculator) IncPrerelease(preReleaseType string, version *semver.Versio
log.Warnf("Could not parse release tag %s, use version %s", version.Prerelease(), version.String()) log.Warnf("Could not parse release tag %s, use version %s", version.Prerelease(), version.String())
return version.SetPrerelease(defaultPrerelease) return version.SetPrerelease(defaultPrerelease)
} }
return version.SetPrerelease(preReleaseType + "." + strconv.Itoa((i + 1))) return version.SetPrerelease(preReleaseType + "." + strconv.Itoa(i+1))
} }
log.Warnf("Could not parse release tag %s, use version %s", version.Prerelease(), version.String()) log.Warnf("Could not parse release tag %s, use version %s", version.Prerelease(), version.String())
return version.SetPrerelease(defaultPrerelease) return version.SetPrerelease(defaultPrerelease)
} }
func (c *Calculator) hasPrerelease(version semver.Version, preReleaseType string) bool {
if version.Prerelease() == "" || !strings.HasPrefix(version.Prerelease(), preReleaseType) {
return false
}
return true
}
//CalculateNewVersion from given commits and lastversion //CalculateNewVersion from given commits and lastversion
func (c *Calculator) CalculateNewVersion(commits map[shared.Release][]shared.AnalyzedCommit, lastVersion *semver.Version, releaseType string, firstRelease bool) semver.Version { func (c *Calculator) CalculateNewVersion(commits map[shared.Release][]shared.AnalyzedCommit, lastVersion *semver.Version, releaseType string, firstRelease bool) semver.Version {
switch releaseType { switch releaseType {
case "beta", "alpha", "rc": case "beta", "alpha", "rc":
var version = *lastVersion
if !c.hasPrerelease(*lastVersion, releaseType) {
version, _ = c.inc(commits, lastVersion)
}
if len(commits["major"]) > 0 || len(commits["minor"]) > 0 || len(commits["patch"]) > 0 { if len(commits["major"]) > 0 || len(commits["minor"]) > 0 || len(commits["patch"]) > 0 {
version, _ := c.IncPrerelease(releaseType, lastVersion) version, _ := c.IncPrerelease(releaseType, version)
return version return version
} }
case "release": case "release":
@@ -53,16 +65,23 @@ func (c *Calculator) CalculateNewVersion(commits map[shared.Release][]shared.Ana
newVersion, _ := lastVersion.SetPrerelease("") newVersion, _ := lastVersion.SetPrerelease("")
return newVersion return newVersion
} }
version, done := c.inc(commits, lastVersion)
if len(commits["major"]) > 0 { if done {
return lastVersion.IncMajor() return version
} else if len(commits["minor"]) > 0 {
return lastVersion.IncMinor()
} else if len(commits["patch"]) > 0 {
return lastVersion.IncPatch()
} }
} }
} }
return *lastVersion return *lastVersion
} }
func (c *Calculator) inc(commits map[shared.Release][]shared.AnalyzedCommit, lastVersion *semver.Version) (semver.Version, bool) {
if len(commits["major"]) > 0 {
return lastVersion.IncMajor(), true
} else if len(commits["minor"]) > 0 {
return lastVersion.IncMinor(), true
} else if len(commits["patch"]) > 0 {
return lastVersion.IncPatch(), true
}
return semver.Version{}, false
}

View File

@@ -58,9 +58,11 @@ func TestCalculator_IncPrerelease(t *testing.T) {
c := calculator.New() c := calculator.New()
for _, test := range testConfigs { for _, test := range testConfigs {
next, err := c.IncPrerelease(test.preReleaseType, test.lastVersion) t.Run(test.testCase, func(t *testing.T) {
assert.Equalf(t, test.hasError, err != nil, "Testcase %s should have error: %t -> %s", test.testCase, test.hasError, err) next, err := c.IncPrerelease(test.preReleaseType, *test.lastVersion)
assert.Equal(t, test.nextVersion, next.String()) assert.Equalf(t, test.hasError, err != nil, "Testcase %s should have error: %t -> %s", test.testCase, test.hasError, err)
assert.Equal(t, test.nextVersion, next.String())
})
} }
} }
@@ -79,7 +81,7 @@ func TestCalculator_CalculateNewVersion(t *testing.T) {
testCase: "version with preRelease alpha", testCase: "version with preRelease alpha",
releaseType: "alpha", releaseType: "alpha",
lastVersion: createVersion("1.0.0"), lastVersion: createVersion("1.0.0"),
nextVersion: "1.0.0-alpha.0", nextVersion: "1.1.0-alpha.0",
analyzedCommits: map[shared.Release][]shared.AnalyzedCommit{ analyzedCommits: map[shared.Release][]shared.AnalyzedCommit{
"major": []shared.AnalyzedCommit{}, "major": []shared.AnalyzedCommit{},
"minor": []shared.AnalyzedCommit{ "minor": []shared.AnalyzedCommit{
@@ -94,7 +96,7 @@ func TestCalculator_CalculateNewVersion(t *testing.T) {
testCase: "version with preRelease beta", testCase: "version with preRelease beta",
releaseType: "beta", releaseType: "beta",
lastVersion: createVersion("1.0.0"), lastVersion: createVersion("1.0.0"),
nextVersion: "1.0.0-beta.0", nextVersion: "1.1.0-beta.0",
analyzedCommits: map[shared.Release][]shared.AnalyzedCommit{ analyzedCommits: map[shared.Release][]shared.AnalyzedCommit{
"major": []shared.AnalyzedCommit{}, "major": []shared.AnalyzedCommit{},
"minor": []shared.AnalyzedCommit{ "minor": []shared.AnalyzedCommit{
@@ -135,7 +137,7 @@ func TestCalculator_CalculateNewVersion(t *testing.T) {
testCase: "version with commits and rc release", testCase: "version with commits and rc release",
releaseType: "rc", releaseType: "rc",
lastVersion: createVersion("1.0.0"), lastVersion: createVersion("1.0.0"),
nextVersion: "1.0.0-rc.0", nextVersion: "2.0.0-rc.0",
analyzedCommits: map[shared.Release][]shared.AnalyzedCommit{ analyzedCommits: map[shared.Release][]shared.AnalyzedCommit{
"major": []shared.AnalyzedCommit{shared.AnalyzedCommit{}}, "major": []shared.AnalyzedCommit{shared.AnalyzedCommit{}},
"minor": []shared.AnalyzedCommit{shared.AnalyzedCommit{}}, "minor": []shared.AnalyzedCommit{shared.AnalyzedCommit{}},
@@ -201,8 +203,10 @@ func TestCalculator_CalculateNewVersion(t *testing.T) {
c := calculator.New() c := calculator.New()
for _, test := range testConfigs { for _, test := range testConfigs {
next := c.CalculateNewVersion(test.analyzedCommits, test.lastVersion, test.releaseType, test.isFirst) t.Run(test.testCase, func(t *testing.T) {
assert.Equalf(t, test.nextVersion, next.String(), "Should have version %s for testcase %s", test.nextVersion, test.testCase) next := c.CalculateNewVersion(test.analyzedCommits, test.lastVersion, test.releaseType, test.isFirst)
assert.Equalf(t, test.nextVersion, next.String(), "Should have version %s for testcase %s", test.nextVersion, test.testCase)
})
} }
} }

View File

@@ -15,18 +15,19 @@ import (
) )
const defaultCommitList string = `{{ range $index,$commit := .BreakingChanges -}} const defaultCommitList string = `{{ range $index,$commit := .BreakingChanges -}}
{{ if eq $index 0 }} {{ if eq $index 0 -}}
## BREAKING CHANGES ## BREAKING CHANGES
{{ end}}
* **{{$.Backtick}}{{$commit.Scope}}{{$.Backtick}}** {{$commit.ParsedBreakingChangeMessage}}
introduced by commit:
{{$commit.ParsedMessage}} {{if $.HasURL}} ([{{ printf "%.7s" $commit.Commit.Hash}}]({{ replace $.URL "{{hash}}" $commit.Commit.Hash}})) {{end}}
{{ end -}} {{ end -}}
{{ range $key := .Order }} * {{ if $commit.Scope }}**{{$.Backtick}}{{$commit.Scope}}{{$.Backtick}}**{{ end }} {{$commit.ParsedBreakingChangeMessage}}
{{ $commits := index $.Commits $key}} {{if $commits -}} introduced by commit:
{{$commit.ParsedMessage}} {{if $.HasURL}} ([{{ printf "%.7s" $commit.Commit.Hash}}]({{ replace $.URL "{{hash}}" $commit.Commit.Hash}})){{end}}
{{ end -}}
{{ range $key := .Order -}}
{{ $commits := index $.Commits $key -}}
{{ if $commits -}}
### {{ $key }} ### {{ $key }}
{{ range $index,$commit := $commits -}} {{ range $index,$commit := $commits -}}
* **{{$.Backtick}}{{$commit.Scope}}{{$.Backtick}}** {{$commit.ParsedMessage}} {{if $.HasURL}} ([{{ printf "%.7s" $commit.Commit.Hash}}]({{ replace $.URL "{{hash}}" $commit.Commit.Hash}})) {{end}} * {{ if $commit.Scope }}**{{$.Backtick}}{{$commit.Scope}}{{$.Backtick}}** {{end}}{{$commit.ParsedMessage}}{{if $.HasURL}} ([{{ printf "%.7s" $commit.Commit.Hash}}]({{ replace $.URL "{{hash}}" $commit.Commit.Hash}})){{end}}
{{ end -}} {{ end -}}
{{ end -}} {{ end -}}
{{ end -}}` {{ end -}}`

View File

@@ -32,7 +32,7 @@ func TestChangelog(t *testing.T) {
"minor": []shared.AnalyzedCommit{ "minor": []shared.AnalyzedCommit{
shared.AnalyzedCommit{ shared.AnalyzedCommit{
Commit: shared.Commit{ Commit: shared.Commit{
Message: "feat(test): my first commit", Message: "feat(internal/changelog): my first commit",
Author: "me", Author: "me",
Hash: "12345667", Hash: "12345667",
}, },
@@ -46,7 +46,30 @@ func TestChangelog(t *testing.T) {
}, },
result: &shared.GeneratedChangelog{ result: &shared.GeneratedChangelog{
Title: "v1.0.0 (2019-07-19)", Title: "v1.0.0 (2019-07-19)",
Content: "# v1.0.0 (2019-07-19)\n\n ### Features\n* **`internal/changelog`** my first commit ([1234566](https://commit.url)) \n\n ", Content: "# v1.0.0 (2019-07-19)\n### Features\n* **`internal/changelog`** my first commit ([1234566](https://commit.url))\n",
},
hasError: false,
},
{
testCase: "feat no scope",
analyzedCommits: map[shared.Release][]shared.AnalyzedCommit{
"minor": []shared.AnalyzedCommit{
shared.AnalyzedCommit{
Commit: shared.Commit{
Message: "feat: my first commit",
Author: "me",
Hash: "12345667",
},
ParsedMessage: "my first commit",
Tag: "feat",
TagString: "Features",
Print: true,
},
},
},
result: &shared.GeneratedChangelog{
Title: "v1.0.0 (2019-07-19)",
Content: "# v1.0.0 (2019-07-19)\n### Features\n* my first commit ([1234566](https://commit.url))\n",
}, },
hasError: false, hasError: false,
}, },
@@ -56,7 +79,7 @@ func TestChangelog(t *testing.T) {
"minor": []shared.AnalyzedCommit{ "minor": []shared.AnalyzedCommit{
shared.AnalyzedCommit{ shared.AnalyzedCommit{
Commit: shared.Commit{ Commit: shared.Commit{
Message: "feat(test): my first commit", Message: "feat(internal/changelog): my first commit",
Author: "me", Author: "me",
Hash: "12345667", Hash: "12345667",
}, },
@@ -68,7 +91,7 @@ func TestChangelog(t *testing.T) {
}, },
shared.AnalyzedCommit{ shared.AnalyzedCommit{
Commit: shared.Commit{ Commit: shared.Commit{
Message: "feat(test): my first break: BREAKING CHANGE: change api to v2", Message: "feat(internal/changelog): my first break: BREAKING CHANGE: change api to v2",
Author: "me", Author: "me",
Hash: "12345668", Hash: "12345668",
}, },
@@ -83,7 +106,7 @@ func TestChangelog(t *testing.T) {
}, },
result: &shared.GeneratedChangelog{ result: &shared.GeneratedChangelog{
Title: "v1.0.0 (2019-07-19)", Title: "v1.0.0 (2019-07-19)",
Content: "# v1.0.0 (2019-07-19)\n\n## BREAKING CHANGES\n\n* **`internal/changelog`** change api to v2 \nintroduced by commit: \nmy first break ([1234566](https://commit.url)) \n\n ### Features\n* **`internal/changelog`** my first commit ([1234566](https://commit.url)) \n\n ", Content: "# v1.0.0 (2019-07-19)\n## BREAKING CHANGES\n* **`internal/changelog`** change api to v2 \nintroduced by commit: \nmy first break ([1234566](https://commit.url))\n### Features\n* **`internal/changelog`** my first commit ([1234566](https://commit.url))\n",
}, },
hasError: false, hasError: false,
}, },
@@ -111,9 +134,11 @@ func TestChangelog(t *testing.T) {
}, time.Date(2019, 7, 19, 0, 0, 0, 0, time.UTC)) }, time.Date(2019, 7, 19, 0, 0, 0, 0, time.UTC))
for _, config := range testConfigs { for _, config := range testConfigs {
generatedChangelog, err := cl.GenerateChanglog(templateConfig, config.analyzedCommits) t.Run(config.testCase, func(t *testing.T) {
assert.Equalf(t, config.hasError, err != nil, "Testcase %s should have error: %t -> %s", config.testCase, config.hasError, err) generatedChangelog, err := cl.GenerateChanglog(templateConfig, config.analyzedCommits)
assert.Equalf(t, config.result, generatedChangelog, "Testcase %s should have generated changelog", config.testCase) assert.Equalf(t, config.hasError, err != nil, "Testcase %s should have error: %t -> %s", config.testCase, config.hasError, err)
assert.Equalf(t, config.result, generatedChangelog, "Testcase %s should have generated changelog", config.testCase)
})
} }
} }

View File

@@ -39,13 +39,13 @@ func ReadAllEnvs() map[string]string {
} }
//GetCIProvider get provider //GetCIProvider get provider
func GetCIProvider(gitUtil *gitutil.GitUtil, envs map[string]string) (*ProviderConfig, error) { func GetCIProvider(gitUtil *gitutil.GitUtil, configCheck bool, envs map[string]string) (*ProviderConfig, error) {
services := []Service{ services := []Service{
Travis{}, Travis{},
GithubActions{}, GithubActions{},
GitlabCI{}, GitlabCI{},
Git{gitUtil: gitUtil}, // GIt must be the last option to check Git{gitUtil: gitUtil}, // Git must be the last option to check
} }
for _, service := range services { for _, service := range services {
@@ -57,5 +57,9 @@ func GetCIProvider(gitUtil *gitutil.GitUtil, envs map[string]string) (*ProviderC
} }
log.Debugf("%s", err.Error()) log.Debugf("%s", err.Error())
} }
return nil, fmt.Errorf("could not find any CI, if running locally set env CI=true") if configCheck {
return nil, fmt.Errorf("could not find any CI, if running locally set env CI=true")
}
return Git{gitUtil: gitUtil}.detect(map[string]string{"CI": "true"})
} }

View File

@@ -127,7 +127,7 @@ func TestCi(t *testing.T) {
} }
for _, config := range testConfigs { for _, config := range testConfigs {
provider, err := ci.GetCIProvider(gitUtilInMemory, config.envs) provider, err := ci.GetCIProvider(gitUtilInMemory, true, config.envs)
assert.Equalf(t, config.hasError, err != nil, "Service %s should have error: %t -> %s", config.service, config.hasError, err) assert.Equalf(t, config.hasError, err != nil, "Service %s should have error: %t -> %s", config.service, config.hasError, err)
assert.Equalf(t, config.result, provider, "Service %s should have provider", config.service) assert.Equalf(t, config.result, provider, "Service %s should have provider", config.service)
} }

View File

@@ -90,7 +90,7 @@ func (g *GitUtil) GetLastVersion() (*semver.Version, string, error) {
err = gitTags.ForEach(func(p *plumbing.Reference) error { err = gitTags.ForEach(func(p *plumbing.Reference) error {
v, err := semver.NewVersion(p.Name().Short()) v, err := semver.NewVersion(p.Name().Short())
log.Tracef("Tag %+v with hash: %s", p.Target(), p.Hash()) log.Tracef("Tag %+v with hash: %s", p.Name().Short(), p.Hash())
if err == nil { if err == nil {
tags = append(tags, v) tags = append(tags, v)

77
internal/hooks/hooks.go Normal file
View File

@@ -0,0 +1,77 @@
package hooks
import (
"bufio"
"os/exec"
"runtime"
"strings"
"github.com/Nightapes/go-semantic-release/internal/shared"
"github.com/Nightapes/go-semantic-release/pkg/config"
log "github.com/sirupsen/logrus"
)
//Hooks struct
type Hooks struct {
version *shared.ReleaseVersion
config *config.ReleaseConfig
}
// New hooks struct
func New(config *config.ReleaseConfig, version *shared.ReleaseVersion) *Hooks {
return &Hooks{
config: config,
version: version,
}
}
// PreRelease runs before creating release
func (h *Hooks) PreRelease() error {
log.Infof("Run pre release hooks")
for _, cmd := range h.config.Hooks.PreRelease {
log.Debugf("Run %s", cmd)
err := h.runCommand(cmd)
if err != nil {
return err
}
}
return nil
}
// PostRelease runs after creating release
func (h *Hooks) PostRelease() error {
log.Infof("Run post release hooks")
for _, cmd := range h.config.Hooks.PostRelease {
err := h.runCommand(cmd)
if err != nil {
return err
}
}
return nil
}
func (h *Hooks) runCommand(command string) error {
cmdReplaced := strings.ReplaceAll(command, "$RELEASE_VERSION", h.version.Next.Version.String())
var cmd *exec.Cmd
if runtime.GOOS == "windows" {
cmd = exec.Command("cmd.exe", "/C", cmdReplaced)
} else {
cmd = exec.Command("sh", "-c", cmdReplaced)
}
cmdReader, err := cmd.StdoutPipe()
if err != nil {
return err
}
scanner := bufio.NewScanner(cmdReader)
go func() {
for scanner.Scan() {
log.WithField("cmd", strings.Fields(cmdReplaced)[0]).Infof("%s\n", scanner.Text())
}
}()
return cmd.Run()
}

View File

@@ -0,0 +1,103 @@
package hooks_test
import (
"os"
"testing"
"github.com/Masterminds/semver"
"github.com/Nightapes/go-semantic-release/internal/hooks"
"github.com/Nightapes/go-semantic-release/internal/shared"
"github.com/Nightapes/go-semantic-release/pkg/config"
"github.com/stretchr/testify/assert"
)
func TestPreReleaseHooks(t *testing.T) {
os.Setenv("GO_WANT_HELPER_PROCESS", "1")
hooks := hooks.New(&config.ReleaseConfig{
Hooks: config.Hooks{
PreRelease: []string{
"go test -test.run=TestHelperProcess -- " + "$RELEASE_VERSION",
},
},
},
&shared.ReleaseVersion{
Next: shared.ReleaseVersionEntry{
Version: createVersion("1.0.0"),
},
})
err := hooks.PreRelease()
assert.NoError(t, err)
os.Unsetenv("GO_WANT_HELPER_PROCESS")
}
func TestPreReleaseHooksError(t *testing.T) {
hooks := hooks.New(&config.ReleaseConfig{
Hooks: config.Hooks{
PreRelease: []string{
"exit 1",
},
},
},
&shared.ReleaseVersion{
Next: shared.ReleaseVersionEntry{
Version: createVersion("1.0.0"),
},
})
err := hooks.PreRelease()
assert.Error(t, err)
}
func TestPostReleaseHooks(t *testing.T) {
os.Setenv("GO_WANT_HELPER_PROCESS", "1")
hooks := hooks.New(&config.ReleaseConfig{
Hooks: config.Hooks{
PostRelease: []string{
"go test -test.run=TestHelperProcess -- " + "$RELEASE_VERSION",
},
},
},
&shared.ReleaseVersion{
Next: shared.ReleaseVersionEntry{
Version: createVersion("1.0.0"),
},
})
err := hooks.PostRelease()
assert.NoError(t, err)
os.Unsetenv("GO_WANT_HELPER_PROCESS")
}
func TestPostReleaseHooksError(t *testing.T) {
hooks := hooks.New(&config.ReleaseConfig{
Hooks: config.Hooks{
PostRelease: []string{
"exit 1",
},
},
},
&shared.ReleaseVersion{
Next: shared.ReleaseVersionEntry{
Version: createVersion("1.0.0"),
},
})
err := hooks.PostRelease()
assert.Error(t, err)
}
func TestHelperProcess(t *testing.T) {
if os.Getenv("GO_WANT_HELPER_PROCESS") != "1" {
return
}
assert.Contains(t, os.Args, "1.0.0")
}
func createVersion(version string) *semver.Version {
ver, _ := semver.NewVersion(version)
return ver
}

View File

@@ -0,0 +1,101 @@
package git
import (
"fmt"
"time"
"github.com/Nightapes/go-semantic-release/internal/gitutil"
"github.com/Nightapes/go-semantic-release/internal/shared"
"github.com/Nightapes/go-semantic-release/pkg/config"
"gopkg.in/src-d/go-git.v4"
gitConfig "gopkg.in/src-d/go-git.v4/config"
"gopkg.in/src-d/go-git.v4/plumbing/object"
"gopkg.in/src-d/go-git.v4/plumbing/transport/http"
log "github.com/sirupsen/logrus"
)
// GITONLY identifer for git interface
const GITONLY = "git"
// Client type struct
type Client struct {
config *config.GitProvider
log *log.Entry
git *gitutil.GitUtil
}
// New initialize a new gitRelease
func New(config *config.GitProvider, git *gitutil.GitUtil, checkConfig bool) (*Client, error) {
logger := log.WithField("releaser", GITONLY)
if config.Email == "" && checkConfig {
return nil, fmt.Errorf("git email not set")
}
if config.Username == "" && checkConfig {
return nil, fmt.Errorf("git username not set")
}
if !config.SSH && config.Auth == "" && checkConfig {
return nil, fmt.Errorf("git auth not set")
}
if config.SSH {
return nil, fmt.Errorf("git ssh not supported yet")
}
return &Client{
config: config,
log: logger,
git: git,
}, nil
}
//GetCommitURL for git
func (g *Client) GetCommitURL() string {
return ""
}
//GetCompareURL for git
func (g *Client) GetCompareURL(oldVersion, newVersion string) string {
return ""
}
// CreateRelease creates release on remote
func (g *Client) CreateRelease(releaseVersion *shared.ReleaseVersion, generatedChangelog *shared.GeneratedChangelog) error {
tag := "v" + releaseVersion.Next.Version.String()
g.log.Infof("create release with version %s", tag)
head, err := g.git.Repository.Head()
if err != nil {
return err
}
_, err = g.git.Repository.CreateTag(tag, head.Hash(), &git.CreateTagOptions{Message: "Release " + tag, Tagger: &object.Signature{
Name: g.config.Username,
Email: g.config.Email,
When: time.Now(),
}})
if err != nil {
return err
}
g.log.Infof("Created release")
return g.git.Repository.Push(&git.PushOptions{
Auth: &http.BasicAuth{
Username: g.config.Username,
Password: g.config.Auth,
},
RefSpecs: []gitConfig.RefSpec{"refs/tags/*:refs/tags/*"},
})
}
// UploadAssets uploads specified assets
func (g *Client) UploadAssets(repoDir string, assets []config.Asset) error {
return nil
}

View File

@@ -29,17 +29,27 @@ type Client struct {
} }
// New initialize a new GitHubRelease // New initialize a new GitHubRelease
func New(c *config.GitHubProvider) (*Client, error) { func New(c *config.GitHubProvider, checkConfig bool) (*Client, error) {
var err error
if c.AccessToken, err = util.GetAccessToken("GITHUB_TOKEN"); err != nil { token, err := util.GetAccessToken("GITHUB_TOKEN")
if err != nil && checkConfig {
return &Client{}, err return &Client{}, err
} }
c.AccessToken = token
ctx := context.Background() ctx := context.Background()
httpClient := util.CreateBearerHTTPClient(ctx, c.AccessToken) httpClient := util.CreateBearerHTTPClient(ctx, c.AccessToken)
var client *github.Client var client *github.Client
baseURL := "https://github.com" baseURL := "https://github.com"
if c.Repo == "" && checkConfig {
return nil, fmt.Errorf("github repro is not set")
}
if c.User == "" && checkConfig {
return nil, fmt.Errorf("github user is not set")
}
if c.CustomURL == "" { if c.CustomURL == "" {
client = github.NewClient(httpClient) client = github.NewClient(httpClient)
} else { } else {
@@ -54,7 +64,7 @@ func New(c *config.GitHubProvider) (*Client, error) {
context: ctx, context: ctx,
baseURL: baseURL, baseURL: baseURL,
log: log.WithField("releaser", GITHUB), log: log.WithField("releaser", GITHUB),
}, err }, nil
} }
//GetCommitURL for github //GetCommitURL for github
@@ -67,26 +77,10 @@ func (g *Client) GetCompareURL(oldVersion, newVersion string) string {
return fmt.Sprintf("%s/%s/%s/compare/%s...%s", g.baseURL, g.config.User, g.config.Repo, oldVersion, newVersion) return fmt.Sprintf("%s/%s/%s/compare/%s...%s", g.baseURL, g.config.User, g.config.Repo, oldVersion, newVersion)
} }
//ValidateConfig for github
func (g *Client) ValidateConfig() error {
g.log.Debugf("validate GitHub provider config")
if g.config.Repo == "" {
return fmt.Errorf("github Repro is not set")
}
if g.config.User == "" {
return fmt.Errorf("github User is not set")
}
return nil
}
// CreateRelease creates release on remote // CreateRelease creates release on remote
func (g *Client) CreateRelease(releaseVersion *shared.ReleaseVersion, generatedChangelog *shared.GeneratedChangelog) error { func (g *Client) CreateRelease(releaseVersion *shared.ReleaseVersion, generatedChangelog *shared.GeneratedChangelog) error {
tag := releaseVersion.Next.Version.String() tag := "v" + releaseVersion.Next.Version.String()
g.log.Debugf("create release with version %s", tag) g.log.Debugf("create release with version %s", tag)
prerelease := releaseVersion.Next.Version.Prerelease() != "" prerelease := releaseVersion.Next.Version.Prerelease() != ""

View File

@@ -48,29 +48,6 @@ var testNewClient = []testHelperMethodStruct{
}, },
} }
var testHelperMethod = []testHelperMethodStruct{
testHelperMethodStruct{config: config.GitHubProvider{
Repo: "foo",
User: "bar",
},
valid: true,
},
testHelperMethodStruct{config: config.GitHubProvider{
Repo: "",
User: "bar",
},
valid: false,
},
testHelperMethodStruct{config: config.GitHubProvider{
Repo: "foo",
User: "",
},
valid: false,
},
}
var lastVersion, _ = semver.NewVersion("1.0.0") var lastVersion, _ = semver.NewVersion("1.0.0")
var newVersion, _ = semver.NewVersion("2.0.0") var newVersion, _ = semver.NewVersion("2.0.0")
@@ -146,7 +123,7 @@ func TestNew(t *testing.T) {
os.Setenv("GITHUB_TOKEN", "XXX") os.Setenv("GITHUB_TOKEN", "XXX")
} }
_, err := github.New(&testOject.config) _, err := github.New(&testOject.config, true)
assert.Equal(t, testOject.valid, err == nil) assert.Equal(t, testOject.valid, err == nil)
os.Unsetenv("GITHUB_TOKEN") os.Unsetenv("GITHUB_TOKEN")
@@ -157,7 +134,7 @@ func TestNew(t *testing.T) {
func TestGetCommitURL(t *testing.T) { func TestGetCommitURL(t *testing.T) {
os.Setenv("GITHUB_TOKEN", "XX") os.Setenv("GITHUB_TOKEN", "XX")
for _, testOject := range testNewClient { for _, testOject := range testNewClient {
client, _ := github.New(&testOject.config) client, _ := github.New(&testOject.config, false)
actualURL := client.GetCommitURL() actualURL := client.GetCommitURL()
if testOject.config.CustomURL != "" { if testOject.config.CustomURL != "" {
expectedURL := fmt.Sprintf("%s/%s/%s/commit/{{hash}}", testOject.config.CustomURL, testOject.config.User, testOject.config.Repo) expectedURL := fmt.Sprintf("%s/%s/%s/commit/{{hash}}", testOject.config.CustomURL, testOject.config.User, testOject.config.Repo)
@@ -175,7 +152,7 @@ func TestGetCommitURL(t *testing.T) {
func TestGetCompareURL(t *testing.T) { func TestGetCompareURL(t *testing.T) {
os.Setenv("GITHUB_TOKEN", "XX") os.Setenv("GITHUB_TOKEN", "XX")
for _, testOject := range testNewClient { for _, testOject := range testNewClient {
client, _ := github.New(&testOject.config) client, _ := github.New(&testOject.config, false)
actualURL := client.GetCompareURL("1", "2") actualURL := client.GetCompareURL("1", "2")
if testOject.config.CustomURL != "" { if testOject.config.CustomURL != "" {
expectedURL := fmt.Sprintf("%s/%s/%s/compare/%s...%s", testOject.config.CustomURL, testOject.config.User, testOject.config.Repo, "1", "2") expectedURL := fmt.Sprintf("%s/%s/%s/compare/%s...%s", testOject.config.CustomURL, testOject.config.User, testOject.config.Repo, "1", "2")
@@ -190,18 +167,6 @@ func TestGetCompareURL(t *testing.T) {
} }
func TestValidateConfig(t *testing.T) {
os.Setenv("GITHUB_TOKEN", "XX")
for _, testOject := range testHelperMethod {
client, _ := github.New(&testOject.config)
err := client.ValidateConfig()
assert.Equal(t, testOject.valid, err == nil)
}
os.Unsetenv("GITHUB_TOKEN")
}
func TestCreateRelease(t *testing.T) { func TestCreateRelease(t *testing.T) {
os.Setenv("GITHUB_TOKEN", "XX") os.Setenv("GITHUB_TOKEN", "XX")
@@ -209,7 +174,7 @@ func TestCreateRelease(t *testing.T) {
if testObejct.valid { if testObejct.valid {
server := initHTTPServer(testObejct.requestResponseCode, testObejct.requestResponseBody) server := initHTTPServer(testObejct.requestResponseCode, testObejct.requestResponseBody)
testObejct.config.CustomURL = server.URL testObejct.config.CustomURL = server.URL
client, _ := github.New(&testObejct.config) client, _ := github.New(&testObejct.config, false)
err := client.CreateRelease(testObejct.releaseVersion, testObejct.generatedChangelog) err := client.CreateRelease(testObejct.releaseVersion, testObejct.generatedChangelog)
if err != nil { if err != nil {
@@ -221,7 +186,7 @@ func TestCreateRelease(t *testing.T) {
} else { } else {
testObejct.config.CustomURL = "http://foo" testObejct.config.CustomURL = "http://foo"
client, _ := github.New(&testObejct.config) client, _ := github.New(&testObejct.config, false)
err := client.CreateRelease(testObejct.releaseVersion, testObejct.generatedChangelog) err := client.CreateRelease(testObejct.releaseVersion, testObejct.generatedChangelog)
if err != nil { if err != nil {

View File

@@ -34,9 +34,9 @@ type Client struct {
} }
// New initialize a new gitlabRelease // New initialize a new gitlabRelease
func New(config *config.GitLabProvider) (*Client, error) { func New(config *config.GitLabProvider, checkConfig bool) (*Client, error) {
accessToken, err := util.GetAccessToken(fmt.Sprintf("%s_ACCESS_TOKEN", strings.ToUpper(GITLAB))) accessToken, err := util.GetAccessToken(fmt.Sprintf("%s_ACCESS_TOKEN", strings.ToUpper(GITLAB)))
if err != nil { if err != nil && checkConfig {
return nil, err return nil, err
} }
@@ -52,7 +52,7 @@ func New(config *config.GitLabProvider) (*Client, error) {
logger.Debugf("validate gitlab provider config") logger.Debugf("validate gitlab provider config")
if config.Repo == "" { if config.Repo == "" && checkConfig {
return nil, fmt.Errorf("gitlab Repro is not set") return nil, fmt.Errorf("gitlab Repro is not set")
} }
@@ -85,16 +85,10 @@ func (g *Client) GetCompareURL(oldVersion, newVersion string) string {
return fmt.Sprintf("%s/%s/compare/%s...%s", g.baseURL, g.config.Repo, oldVersion, newVersion) return fmt.Sprintf("%s/%s/compare/%s...%s", g.baseURL, g.config.Repo, oldVersion, newVersion)
} }
//ValidateConfig for gitlab
func (g *Client) ValidateConfig() error {
return nil
}
// CreateRelease creates release on remote // CreateRelease creates release on remote
func (g *Client) CreateRelease(releaseVersion *shared.ReleaseVersion, generatedChangelog *shared.GeneratedChangelog) error { func (g *Client) CreateRelease(releaseVersion *shared.ReleaseVersion, generatedChangelog *shared.GeneratedChangelog) error {
tag := releaseVersion.Next.Version.String() tag := "v" + releaseVersion.Next.Version.String()
g.Release = tag g.Release = tag
g.log.Infof("create release with version %s", tag) g.log.Infof("create release with version %s", tag)
url := fmt.Sprintf("%s/projects/%s/releases", g.apiURL, util.PathEscape(g.config.Repo)) url := fmt.Sprintf("%s/projects/%s/releases", g.apiURL, util.PathEscape(g.config.Repo))

View File

@@ -24,7 +24,7 @@ func TestGetCommitURL(t *testing.T) {
client, err := gitlab.New(&config.GitLabProvider{ client, err := gitlab.New(&config.GitLabProvider{
CustomURL: "https://localhost/", CustomURL: "https://localhost/",
Repo: "test/test", Repo: "test/test",
}) }, true)
assert.NoError(t, err) assert.NoError(t, err)
assert.Equal(t, "https://localhost/test/test/commit/{{hash}}", client.GetCommitURL()) assert.Equal(t, "https://localhost/test/test/commit/{{hash}}", client.GetCommitURL())
} }
@@ -35,7 +35,7 @@ func TestGetCompareURL(t *testing.T) {
client, err := gitlab.New(&config.GitLabProvider{ client, err := gitlab.New(&config.GitLabProvider{
CustomURL: "https://localhost/", CustomURL: "https://localhost/",
Repo: "test/test", Repo: "test/test",
}) }, true)
assert.NoError(t, err) assert.NoError(t, err)
assert.Equal(t, "https://localhost/test/test/compare/1.0.0...1.0.1", client.GetCompareURL("1.0.0", "1.0.1")) assert.Equal(t, "https://localhost/test/test/compare/1.0.0...1.0.1", client.GetCompareURL("1.0.0", "1.0.1"))
} }
@@ -45,7 +45,7 @@ func TestValidateConfig_EmptyRepro(t *testing.T) {
defer os.Unsetenv("GITLAB_ACCESS_TOKEN") defer os.Unsetenv("GITLAB_ACCESS_TOKEN")
_, err := gitlab.New(&config.GitLabProvider{ _, err := gitlab.New(&config.GitLabProvider{
CustomURL: "https://localhost/", CustomURL: "https://localhost/",
}) }, true)
assert.Error(t, err) assert.Error(t, err)
} }
@@ -55,7 +55,7 @@ func TestValidateConfig_DefaultURL(t *testing.T) {
config := &config.GitLabProvider{ config := &config.GitLabProvider{
Repo: "localhost/test", Repo: "localhost/test",
} }
_, err := gitlab.New(config) _, err := gitlab.New(config, true)
assert.NoError(t, err) assert.NoError(t, err)
assert.Equal(t, "https://gitlab.com", config.CustomURL) assert.Equal(t, "https://gitlab.com", config.CustomURL)
} }
@@ -67,7 +67,7 @@ func TestValidateConfig_CustomURL(t *testing.T) {
Repo: "/localhost/test/", Repo: "/localhost/test/",
CustomURL: "https://localhost/", CustomURL: "https://localhost/",
} }
_, err := gitlab.New(config) _, err := gitlab.New(config, true)
assert.NoError(t, err) assert.NoError(t, err)
assert.Equal(t, "https://localhost", config.CustomURL) assert.Equal(t, "https://localhost", config.CustomURL)
assert.Equal(t, "localhost/test", config.Repo) assert.Equal(t, "localhost/test", config.Repo)
@@ -108,7 +108,7 @@ func TestCreateRelease(t *testing.T) {
}, },
responseBody: "{}", responseBody: "{}",
responseCode: 200, responseCode: 200,
requestBody: `{"tag_name":"2.0.0","name":"title","ref":"master","description":"content"}`, requestBody: `{"tag_name":"v2.0.0","name":"title","ref":"master","description":"content"}`,
valid: true, valid: true,
}, },
{ {
@@ -132,7 +132,7 @@ func TestCreateRelease(t *testing.T) {
}, },
responseBody: "{}", responseBody: "{}",
responseCode: 500, responseCode: 500,
requestBody: `{"tag_name":"2.0.0","name":"title","ref":"master","description":"content"}`, requestBody: `{"tag_name":"v2.0.0","name":"title","ref":"master","description":"content"}`,
valid: false, valid: false,
}, },
{ {
@@ -157,7 +157,7 @@ func TestCreateRelease(t *testing.T) {
}, },
responseCode: 400, responseCode: 400,
responseBody: "{}", responseBody: "{}",
requestBody: `{"tag_name":"2.0.0","name":"title","ref":"master","description":"content"}`, requestBody: `{"tag_name":"v2.0.0","name":"title","ref":"master","description":"content"}`,
valid: false, valid: false,
}, },
} }
@@ -190,7 +190,7 @@ func TestCreateRelease(t *testing.T) {
} }
os.Setenv("GITLAB_ACCESS_TOKEN", "aToken") os.Setenv("GITLAB_ACCESS_TOKEN", "aToken")
defer os.Unsetenv("GITLAB_ACCESS_TOKEN") defer os.Unsetenv("GITLAB_ACCESS_TOKEN")
client, err := gitlab.New(&testObject.config) client, err := gitlab.New(&testObject.config, false)
assert.NoError(t, err) assert.NoError(t, err)
err = client.CreateRelease(testObject.releaseVersion, testObject.generatedChangelog) err = client.CreateRelease(testObject.releaseVersion, testObject.generatedChangelog)
@@ -317,7 +317,7 @@ func TestUploadAssets(t *testing.T) {
} }
os.Setenv("GITLAB_ACCESS_TOKEN", "aToken") os.Setenv("GITLAB_ACCESS_TOKEN", "aToken")
defer os.Unsetenv("GITLAB_ACCESS_TOKEN") defer os.Unsetenv("GITLAB_ACCESS_TOKEN")
client, err := gitlab.New(&testObject.config) client, err := gitlab.New(&testObject.config, false)
assert.NoError(t, err) assert.NoError(t, err)
client.Release = "1.0.0" client.Release = "1.0.0"

View File

@@ -3,6 +3,8 @@ package releaser
import ( import (
"fmt" "fmt"
"github.com/Nightapes/go-semantic-release/internal/gitutil"
"github.com/Nightapes/go-semantic-release/internal/releaser/git"
"github.com/Nightapes/go-semantic-release/internal/releaser/github" "github.com/Nightapes/go-semantic-release/internal/releaser/github"
"github.com/Nightapes/go-semantic-release/internal/releaser/gitlab" "github.com/Nightapes/go-semantic-release/internal/releaser/gitlab"
"github.com/Nightapes/go-semantic-release/internal/shared" "github.com/Nightapes/go-semantic-release/internal/shared"
@@ -14,33 +16,37 @@ import (
// Releasers struct type // Releasers struct type
type Releasers struct { type Releasers struct {
config *config.ReleaseConfig config *config.ReleaseConfig
git *gitutil.GitUtil
} }
// Releaser interface for providers // Releaser interface for providers
type Releaser interface { type Releaser interface {
ValidateConfig() error
CreateRelease(*shared.ReleaseVersion, *shared.GeneratedChangelog) error CreateRelease(*shared.ReleaseVersion, *shared.GeneratedChangelog) error
UploadAssets(repoDir string, assets []config.Asset) error UploadAssets(repoDir string, assets []config.Asset) error
GetCommitURL() string GetCommitURL() string
GetCompareURL(oldVersion, newVersion string) string GetCompareURL(oldVersion, newVersion string) string
} }
// New initialize a Relerser // New initialize a releaser
func New(c *config.ReleaseConfig) *Releasers { func New(c *config.ReleaseConfig, git *gitutil.GitUtil) *Releasers {
return &Releasers{ return &Releasers{
config: c, config: c,
git: git,
} }
} }
//GetReleaser returns an initialized releaser //GetReleaser returns an initialized releaser
func (r *Releasers) GetReleaser() (Releaser, error) { func (r *Releasers) GetReleaser(checkConfig bool) (Releaser, error) {
switch r.config.Release { switch r.config.Release {
case github.GITHUB: case github.GITHUB:
log.Debugf("initialize new %s-provider", github.GITHUB) log.Debugf("initialize new %s-provider", github.GITHUB)
return github.New(&r.config.GitHubProvider) return github.New(&r.config.GitHubProvider, checkConfig)
case gitlab.GITLAB: case gitlab.GITLAB:
log.Debugf("initialize new %s-provider", gitlab.GITLAB) log.Debugf("initialize new %s-provider", gitlab.GITLAB)
return gitlab.New(&r.config.GitLabProvider) return gitlab.New(&r.config.GitLabProvider, checkConfig)
case git.GITONLY:
log.Debugf("initialize new %s-provider", git.GITONLY)
return git.New(&r.config.GitProvider, r.git, checkConfig)
} }
return nil, fmt.Errorf("could not initialize a releaser from this type: %s", r.config.Release) return nil, fmt.Errorf("could not initialize a releaser from this type: %s", r.config.Release)
} }

View File

@@ -3,6 +3,7 @@ package config
import ( import (
"io/ioutil" "io/ioutil"
"os"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"gopkg.in/yaml.v2" "gopkg.in/yaml.v2"
@@ -50,6 +51,20 @@ type GitLabProvider struct {
AccessToken string AccessToken string
} }
// GitProvider struct
type GitProvider struct {
Email string `yaml:"email"`
Username string `yaml:"user"`
Auth string `yaml:"auth"`
SSH bool `yaml:"ssh"`
}
// Hooks struct
type Hooks struct {
PreRelease []string `yaml:"preRelease"`
PostRelease []string `yaml:"postRelease"`
}
// ReleaseConfig struct // ReleaseConfig struct
type ReleaseConfig struct { type ReleaseConfig struct {
CommitFormat string `yaml:"commitFormat"` CommitFormat string `yaml:"commitFormat"`
@@ -58,7 +73,9 @@ type ReleaseConfig struct {
Release string `yaml:"release,omitempty"` Release string `yaml:"release,omitempty"`
GitHubProvider GitHubProvider `yaml:"github,omitempty"` GitHubProvider GitHubProvider `yaml:"github,omitempty"`
GitLabProvider GitLabProvider `yaml:"gitlab,omitempty"` GitLabProvider GitLabProvider `yaml:"gitlab,omitempty"`
GitProvider GitProvider `yaml:"git,omitempty"`
Assets []Asset `yaml:"assets"` Assets []Asset `yaml:"assets"`
Hooks Hooks `yaml:"hooks"`
ReleaseTitle string `yaml:"title"` ReleaseTitle string `yaml:"title"`
IsPreRelease bool IsPreRelease bool
} }
@@ -71,13 +88,31 @@ func Read(configPath string) (*ReleaseConfig, error) {
return &ReleaseConfig{}, err return &ReleaseConfig{}, err
} }
var releaseConfig ReleaseConfig log.Tracef("Found config %s", string(content))
err = yaml.Unmarshal(content, &releaseConfig) releaseConfig := &ReleaseConfig{}
err = yaml.Unmarshal(content, releaseConfig)
if err != nil { if err != nil {
return &ReleaseConfig{}, err return &ReleaseConfig{}, err
} }
log.Tracef("Found config %+v", releaseConfig) org := *releaseConfig
return &releaseConfig, nil releaseConfig.Hooks = Hooks{}
configWithoutHooks, err := yaml.Marshal(releaseConfig)
if err != nil {
return &ReleaseConfig{}, err
}
configWithoutHooks = []byte(os.ExpandEnv(string(configWithoutHooks)))
releaseConfigWithExpanedEnvs := &ReleaseConfig{}
err = yaml.Unmarshal(configWithoutHooks, releaseConfigWithExpanedEnvs)
if err != nil {
return &ReleaseConfig{}, err
}
releaseConfigWithExpanedEnvs.Hooks = org.Hooks
log.Tracef("Found config %+v", releaseConfigWithExpanedEnvs)
return releaseConfigWithExpanedEnvs, nil
} }

View File

@@ -41,6 +41,9 @@ func TestWriteAndReadCache(t *testing.T) {
assert.NoError(t, err) assert.NoError(t, err)
defer os.RemoveAll(dir) defer os.RemoveAll(dir)
os.Setenv("TEST_CONFIG", "value")
defer os.Unsetenv("TEST_CONFIG")
completePath := path.Join(path.Dir(dir), ".release.yml") completePath := path.Join(path.Dir(dir), ".release.yml")
content := []byte(` content := []byte(`
commitFormat: angular commitFormat: angular
@@ -53,9 +56,12 @@ branch:
add_git_releases: alpha add_git_releases: alpha
changelog: changelog:
printAll: false printAll: false
template: '' template: ""
templatePath: '' templatePath: '${TEST_CONFIG}'
release: 'github' release: 'github'
hooks:
preRelease:
- "Test hook ${RELEASE_VERSION}"
assets: assets:
- name: ./build/go-semantic-release - name: ./build/go-semantic-release
compress: false compress: false
@@ -76,13 +82,18 @@ github:
Changelog: config.ChangelogConfig{ Changelog: config.ChangelogConfig{
PrintAll: false, PrintAll: false,
TemplateTitle: "", TemplateTitle: "",
TemplatePath: ""}, TemplatePath: "value"},
Release: "github", Release: "github",
GitHubProvider: config.GitHubProvider{ GitHubProvider: config.GitHubProvider{
Repo: "go-semantic-release", Repo: "go-semantic-release",
User: "nightapes", User: "nightapes",
CustomURL: "", CustomURL: "",
AccessToken: ""}, AccessToken: ""},
Hooks: config.Hooks{
PreRelease: []string{
"Test hook ${RELEASE_VERSION}",
},
},
Assets: []config.Asset{ Assets: []config.Asset{
config.Asset{ config.Asset{
Name: "./build/go-semantic-release", Name: "./build/go-semantic-release",

View File

@@ -11,6 +11,7 @@ import (
"github.com/Nightapes/go-semantic-release/internal/changelog" "github.com/Nightapes/go-semantic-release/internal/changelog"
"github.com/Nightapes/go-semantic-release/internal/ci" "github.com/Nightapes/go-semantic-release/internal/ci"
"github.com/Nightapes/go-semantic-release/internal/gitutil" "github.com/Nightapes/go-semantic-release/internal/gitutil"
"github.com/Nightapes/go-semantic-release/internal/hooks"
"github.com/Nightapes/go-semantic-release/internal/releaser" "github.com/Nightapes/go-semantic-release/internal/releaser"
"github.com/Nightapes/go-semantic-release/internal/releaser/util" "github.com/Nightapes/go-semantic-release/internal/releaser/util"
"github.com/Nightapes/go-semantic-release/internal/shared" "github.com/Nightapes/go-semantic-release/internal/shared"
@@ -20,16 +21,17 @@ import (
// SemanticRelease struct // SemanticRelease struct
type SemanticRelease struct { type SemanticRelease struct {
config *config.ReleaseConfig config *config.ReleaseConfig
gitutil *gitutil.GitUtil gitutil *gitutil.GitUtil
analyzer *analyzer.Analyzer analyzer *analyzer.Analyzer
calculator *calculator.Calculator calculator *calculator.Calculator
releaser releaser.Releaser releaser releaser.Releaser
repository string repository string
checkConfig bool
} }
// New SemanticRelease struct // New SemanticRelease struct
func New(c *config.ReleaseConfig, repository string) (*SemanticRelease, error) { func New(c *config.ReleaseConfig, repository string, checkConfig bool) (*SemanticRelease, error) {
util, err := gitutil.New(repository) util, err := gitutil.New(repository)
if err != nil { if err != nil {
return nil, err return nil, err
@@ -40,24 +42,29 @@ func New(c *config.ReleaseConfig, repository string) (*SemanticRelease, error) {
return nil, err return nil, err
} }
releaser, err := releaser.New(c).GetReleaser() if !checkConfig {
log.Infof("Ignore config checks!. No guarantee to run without issues")
}
releaser, err := releaser.New(c, util).GetReleaser(checkConfig)
if err != nil { if err != nil {
return nil, err return nil, err
} }
return &SemanticRelease{ return &SemanticRelease{
config: c, config: c,
gitutil: util, gitutil: util,
releaser: releaser, releaser: releaser,
analyzer: analyzer, analyzer: analyzer,
repository: repository, repository: repository,
calculator: calculator.New(), checkConfig: checkConfig,
calculator: calculator.New(),
}, nil }, nil
} }
//GetCIProvider result with ci config //GetCIProvider result with ci config
func (s *SemanticRelease) GetCIProvider() (*ci.ProviderConfig, error) { func (s *SemanticRelease) GetCIProvider() (*ci.ProviderConfig, error) {
return ci.GetCIProvider(s.gitutil, ci.ReadAllEnvs()) return ci.GetCIProvider(s.gitutil, s.checkConfig, ci.ReadAllEnvs())
} }
// GetNextVersion from .version or calculate new from commits // GetNextVersion from .version or calculate new from commits
@@ -183,7 +190,7 @@ func (s *SemanticRelease) WriteChangeLog(changelogContent, file string) error {
return ioutil.WriteFile(file, []byte(changelogContent), 0644) return ioutil.WriteFile(file, []byte(changelogContent), 0644)
} }
// Release pusblish release to provider // Release publish release to provider
func (s *SemanticRelease) Release(provider *ci.ProviderConfig, force bool) error { func (s *SemanticRelease) Release(provider *ci.ProviderConfig, force bool) error {
if provider.IsPR { if provider.IsPR {
@@ -207,27 +214,31 @@ func (s *SemanticRelease) Release(provider *ci.ProviderConfig, force bool) error
return nil return nil
} }
generatedChanglog, err := s.GetChangelog(releaseVersion) hook := hooks.New(s.config, releaseVersion)
generatedChangelog, err := s.GetChangelog(releaseVersion)
if err != nil { if err != nil {
log.Debugf("Could not get changelog") log.Debugf("Could not get changelog")
return err return err
} }
releaser, err := releaser.New(s.config).GetReleaser() err = hook.PreRelease()
if err != nil { if err != nil {
log.Debugf("Error during pre release hook")
return err return err
} }
err = releaser.ValidateConfig() if err = s.releaser.CreateRelease(releaseVersion, generatedChangelog); err != nil {
return err
}
if err = s.releaser.UploadAssets(s.repository, s.config.Assets); err != nil {
return err
}
err = hook.PostRelease()
if err != nil { if err != nil {
return err log.Debugf("Error during post release hook")
}
if err = releaser.CreateRelease(releaseVersion, generatedChanglog); err != nil {
return err
}
if err = releaser.UploadAssets(s.repository, s.config.Assets); err != nil {
return err return err
} }