From 2f80678a8b7025c2bf81da60dbf70c11b78c9bd2 Mon Sep 17 00:00:00 2001 From: bakerboy448 <55419169+bakerboy448@users.noreply.github.com> Date: Fri, 4 Mar 2022 21:56:28 -0600 Subject: [PATCH] [changelog] update commentary for donate of bitcoin and other fixes --- changelogs/templates/announcements.md | 2 +- changelogs/templates/branch-develop.md | 1 + changelogs/templates/branch-master.md | 6 ++++++ changelogs/templates/commentary.md | 4 ++-- scripts/prowlarr_changelog_post.sh | 12 +++++++++--- 5 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 changelogs/templates/branch-master.md diff --git a/changelogs/templates/announcements.md b/changelogs/templates/announcements.md index 89404530c..2a3e3912c 100644 --- a/changelogs/templates/announcements.md +++ b/changelogs/templates/announcements.md @@ -1,5 +1,5 @@ - Automated API Documentation Updates recently implemented - [*Coming Soon* - Newznab & All Indexer Definitions to YML - Cardigann v5](https://github.com/Prowlarr/Prowlarr/pull/823) - Note that users of Newznab (Usenet) Indexers may see that the UI shows Indexers as added that are not. - - This will be fixed with Cardigann v5 and is due to all the Newznab Indexers sharing the same definition. + - This will be fixed with Cardigann v6 and is due to all the Newznab Indexers sharing the same definition. - https://i.imgur.com/tijCHlk.png \ No newline at end of file diff --git a/changelogs/templates/branch-develop.md b/changelogs/templates/branch-develop.md index badbb6ed7..1712228b7 100644 --- a/changelogs/templates/branch-develop.md +++ b/changelogs/templates/branch-develop.md @@ -1,3 +1,4 @@ +- **Users who do not wish to be on the alpha `nightly` testing branch should take advantage of this parity and switch to `develop` A reminder about the `develop` branch - **develop - Current Develop/Beta - (Beta): This is the testing edge. Released after tested in nightly to ensure no immediate issues. New features and bug fixes released here first. This version will receive updates either weeklyish or bi-weeklyish depending on development.** \ No newline at end of file diff --git a/changelogs/templates/branch-master.md b/changelogs/templates/branch-master.md new file mode 100644 index 000000000..8b146e100 --- /dev/null +++ b/changelogs/templates/branch-master.md @@ -0,0 +1,6 @@ +- **Users who do not wish to be on the alpha `nightly` or beta `develop` testing branches should take advantage of this parity and switch to `master` + +A reminder about the `develop` and `nightly` branches + +- **develop** - Current Develop/Beta - (Beta): This is the testing edge. Released after tested in nightly to ensure no immediate issues. New features and bug fixes released here first. This version will receive updates either weeklyish or bi-weeklyish depending on development.** +- **nightly** - Current Nightly/Unstable - (Alpha/Unstable) : The bleeding edge. Released as soon as code is committed and passed all automated tests. Use this branch only if you know what you are doing and are willing to get your hands dirty to recover a failed update. This version is updated immediately.** \ No newline at end of file diff --git a/changelogs/templates/commentary.md b/changelogs/templates/commentary.md index ecddb3289..5737c021a 100644 --- a/changelogs/templates/commentary.md +++ b/changelogs/templates/commentary.md @@ -1,5 +1,5 @@ - Lidarr v1 coming to `develop` as beta soon^(tm) -- Readarr official beta on `develop` coming soon^(tm) currently dealing with metadata issues -- [Radarr](https://www.reddit.com/r/radarr/comments/sgrsb3/new_stable_release_master_v4045909/) v4.0.4 released to `master` (stable) +- [Lidarr](https://lidarr.audio/donate), [Prowlarr](https://prowlarr.com/donate), [Radarr](https://radarr.video/donate), [Readarr](https://readarr.com/donate) now accept direct bitcoin donations +- [Readarr official beta on `develop` announced](https://www.reddit.com/r/Readarr/comments/sxvj8y/new_beta_release_develop_v0101248/) - [Radarr Postgres Database Support coming soon (PR#6873)](https://github.com/radarr/radarr/pull/6873) - [Lidarr Postgres Database Support in development (Draft PR#2625)](https://github.com/Lidarr/Lidarr/pull/2625) \ No newline at end of file diff --git a/scripts/prowlarr_changelog_post.sh b/scripts/prowlarr_changelog_post.sh index 7506964e1..785f3f4ac 100644 --- a/scripts/prowlarr_changelog_post.sh +++ b/scripts/prowlarr_changelog_post.sh @@ -2,10 +2,10 @@ # Generate a Markdown change log of pull requests from commits between two tags scriptDir=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd) ghRepo="Prowlarr" -branch="develop" +#branch="develop" #read -r -p "What Repo?: " ghRepo #read -r -p "What Org?: [Default:$ghRepo]" ghOrg -#read -r -p "What Branch?:" branch +read -r -p "What Branch? [master|develop|nightly]:" branch ghOrg=${ghOrg:-$ghRepo} ghRepoUrl=https://github.com/$ghOrg/$ghRepo @@ -79,6 +79,12 @@ markdown+="- [hotio/$ghRepo:$hotioBranch](https://hotio.dev/containers/${ghRepo, markdown+="\n\n" markdown+="- [lscr.io/linuxserver/$ghRepo:$lsioBranch](https://docs.linuxserver.io/images/docker-${ghRepo,,})" markdown+="\n\n" +markdown+="## NAS Packages" +markdown+="\n\n" +markdown+="- Synology - Please ask the SynoCommunity to update the base package; however, you can update in-app normally" +markdown+="\n\n" +markdown+="- QNAP - Please ask the QNAP to update the base package; however, you should be able to update in-app normally" +markdown+="\n\n" markdown+="------------" markdown+="\n\n" markdown+="# Release Notes" @@ -87,7 +93,7 @@ markdown+="## $latestTag (changes since $previousTag)" markdown+="\n\n" markdown+="$commits" markdown+="\n\n" -markdown+="- Other bug fixes and improvements, see github history" +markdown+=" - Other bug fixes and improvements, see GitHub history" # Loop over each commit and look for merged pull requests #for COMMIT in $COMMITS; do