diff --git a/Makefile b/Makefile index 494fafbe..86733f49 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ NPM := $(shell command -v npm 2> /dev/null) -HUB := $(shell command -v hub 2> /dev/null) +GH := $(shell command -v gh 2> /dev/null) currentDir = $(shell pwd) serverOutputDir = ${currentDir}/build/server @@ -84,8 +84,8 @@ release-cli: clean build-cli ifndef version $(error version is required. Usage: make version=0.1.0 release-cli) endif -ifndef HUB - $(error please install hub) +ifndef GH + $(error please install github-cli) endif if [ ! -d ${cliHomebrewDir} ]; then \ @@ -96,7 +96,7 @@ endif @echo "==> releasing cli" @${currentDir}/scripts/release.sh cli $(version) ${cliOutputDir} - @echo "===> releading on Homebrew" + @echo "===> releasing on Homebrew" @(cd "${cliHomebrewDir}" && \ ./release.sh "$(version)" "${cliOutputDir}/dnote_$(version)_darwin_amd64.tar.gz") .PHONY: release-cli @@ -105,8 +105,8 @@ release-server: ifndef version $(error version is required. Usage: make version=0.1.0 release-server) endif -ifndef HUB - $(error please install hub) +ifndef GH + $(error please install github-cli) endif @echo "==> releasing server" diff --git a/scripts/release.sh b/scripts/release.sh index c4a7d638..3cda5897 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -34,7 +34,7 @@ git push --tags files=("$assetPath"/*) file_flags=() for file in "${files[@]}"; do - file_flags+=("--attach=$file") + file_flags+=("$file") done # mark as prerelease if version is not in a form of major.minor.patch @@ -47,10 +47,11 @@ fi echo "* creating release" set -x -# first message is the title and the following are body in markdown -hub release create \ +# Create release +gh release create \ + "$version_tag" \ "${file_flags[@]}" \ "${flags[@]}" \ - --message="$version_tag"\ - --message="Please see the [CHANGELOG](https://github.com/dnote/dnote/blob/master/CHANGELOG.md)" \ - "$version_tag" + --title="$version_tag"\ + --notes="Please see the [CHANGELOG](https://github.com/dnote/dnote/blob/master/CHANGELOG.md)" \ + --draft