diff --git a/build_tools/release-notes.sh b/build_tools/release-notes.sh index 00e9777a4..1fedef4e7 100755 --- a/build_tools/release-notes.sh +++ b/build_tools/release-notes.sh @@ -87,7 +87,7 @@ if test -z "$CI" || [ "$(git -C "$workspace_root" tag | wc -l)" -gt 1 ]; then { echo 'Download links:' echo 'To download the source code for fish, we suggest the file named ``fish-'"$version"'.tar.xz``.' echo 'The file downloaded from ``Source code (tar.gz)`` will not build correctly.' - echo 'A GPG signature using the key published at '"${FISH_GPG_PUBLIC_KEY_URL:-???}"' is available as ``fish-'"$version"'.tar.xz.asc``.' + echo 'A GPG signature using [this key]('"${FISH_GPG_PUBLIC_KEY_URL:-???}"') is available as ``fish-'"$version"'.tar.xz.asc``.' echo echo 'The files called ``fish-'"$version"'-linux-*.tar.xz`` contain' echo '`standalone fish binaries `__' diff --git a/build_tools/release.sh b/build_tools/release.sh index 5527c7dc4..b883acf07 100755 --- a/build_tools/release.sh +++ b/build_tools/release.sh @@ -239,6 +239,8 @@ done # This takes care to support remote names that are different from # fish-shell remote name. Also, support detached HEAD state. git push "$fish_site_repo" HEAD:master + git fetch "$fish_site_repo" \ + "$(git rev-parse HEAD):refs/remotes/origin/master" ) if [ -n "$integration_branch" ]; then { @@ -262,17 +264,15 @@ milestone_version="$( echo "$version" fi )" -milestone_number=$( +milestone_number() { gh_api_repo milestones?state=open | jq --arg name "fish $1" ' .[] | select(.title == $name) | .number ' -) -gh_api_repo milestones/"$milestone_number" --method PATCH \ - --raw-field state=closed +} +gh_api_repo milestones/"$(milestone_number "$milestone_version")" \ + --method PATCH --raw-field state=closed -next_minor_version=$(echo "$minor_version" | - awk -F. '{ printf "%s.%s", $1, $2+1 }') if [ -z "$(milestone_number "$next_minor_version")" ]; then gh_api_repo milestones --method POST \ --raw-field title="fish $next_minor_version"