diff --git a/make.sh b/make.sh index d307e655..5f2347d5 100755 --- a/make.sh +++ b/make.sh @@ -58,7 +58,7 @@ HEREDOC echo "\nTagging release" git tag -m "v$VERSION release" "v$VERSION" echo "\nPushing to repository" - git push origin master "v$VERSION" + git push origin master develop "v$VERSION" echo "\nCreating draft release v$VERSION" github-release release --draft -u ansible-semaphore -r semaphore -t "v$VERSION" -d "## Special thanks to\n\n## Installation\n\nFollow [wiki/Installation](https://github.com/ansible-semaphore/semaphore/wiki/Installation)\n\n## Changelog" fi diff --git a/util/config.go b/util/config.go index f3340fe8..35beb21f 100644 --- a/util/config.go +++ b/util/config.go @@ -204,13 +204,9 @@ func (conf *configType) Scan() { } conf.TmpPath = path.Clean(conf.TmpPath) - fmt.Print(" > Web root URL (default http://localhost:8010/): ") + fmt.Print(" > Web root URL (optional, example http://localhost:8010/): ") fmt.Scanln(&conf.WebHost) - if len(conf.WebHost) == 0 { - conf.WebHost = "http://localhost:8010/" - } - var EmailAlertAnswer string fmt.Print(" > Enable email alerts (y/n, default n): ") fmt.Scanln(&EmailAlertAnswer)