diff --git a/.ci/prep_release.sh b/.ci/prep_release.sh index 0eb2091c..5bef26ee 100755 --- a/.ci/prep_release.sh +++ b/.ci/prep_release.sh @@ -47,8 +47,13 @@ if [[ $no_beta ]]; then fi body="${body//--REPLACE-WITH-RELEASE-TITLE--/$title}" else - body="Included commits over previous version: ---REPLACE-WITH-GENERATED-LIST--" + body="--REPLACE-WITH-COMMIT-COUNT-- commits have been included over the previous --REPLACE-WITH-PREVIOUS-RELEASE-TYPE-- + +
+show changes + +--REPLACE-WITH-GENERATED-LIST-- +
" fi # add git log to release notes @@ -78,11 +83,15 @@ else if [[ $previous ]]; then if generated_list="$(git log "$previous..$TAG" --pretty="- %s")"; then count="$(git rev-list --count "$previous..$TAG")" + [[ $previous =~ $beta_regex ]] && previousreleasetype="beta release" || previousreleasetype="full release" echo "adding list of commits to release notes:" echo "'$previous' to '$TAG' ($count commits)" # --> is the markdown comment escape sequence, emojis are way better generated_list="${generated_list//-->/→}" body="${body//--REPLACE-WITH-GENERATED-LIST--/$generated_list}" + body="${body//--REPLACE-WITH-COMMIT-COUNT--/$count}" + body="${body//--REPLACE-WITH-PREVIOUS-RELEASE-TAG--/$previous}" + body="${body//--REPLACE-WITH-PREVIOUS-RELEASE-TYPE--/$previousreleasetype}" if [[ $beta_list =~ $whitespace ]]; then beta_list="-n there are no betas to delete!" else diff --git a/.ci/release_template.md b/.ci/release_template.md index b0db6d99..17cd83e9 100644 --- a/.ci/release_template.md +++ b/.ci/release_template.md @@ -16,8 +16,10 @@ include different targets --> - Ubuntu 18.04 ("Bionic Beaver") - Ubuntu 20.04 ("Focal Fossa") - Ubuntu 20.10 ("Groovy Gorilla") + - Ubuntu 21.04 ("Hirsute Hippo") - Debian 10 ("Buster") - Fedora 33 + - Fedora 34 We are also packaged in Arch Linux's official community repository, courtesy of @FFY00 General linux support is available via a flatpak package (Flathub) @@ -38,6 +40,11 @@ If you'd like to help contribute to Cockatrice in any way, check out our [README ## Upgrading Cockatrice + + - Run the internal software updater: Help → Check for Client Updates Don't forget to update your card database right after! (Help → Check for Card Updates...) @@ -61,10 +68,9 @@ Remove empty headers when done.
-📘 Show all changes - - - + +📘 Show all changes (--REPLACE-WITH-COMMIT-COUNT-- commits) + ### User Interface ### Under the Hood