diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index e5c06150..1b2e9f2a 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -217,6 +217,5 @@ jobs: --arg icon_url "https://mattermost.com/wp-content/uploads/2022/02/icon.png" \ --arg username "MattermostRelease" \ --arg text "$(bash -x scripts/generate_release_post.sh $(jq -r .version package.json))" \ - '{"username":$username,"icon_url": $icon_url, "text": $text }' > /tmp/webhook-data.json \ - cat /tmp/webhook-data.json + '{"username":$username,"icon_url": $icon_url, "text": $text }' > /tmp/webhook-data.json curl -i -H "Content-Type: application/json" -X POST -d @/tmp/webhook-data.json ${{ secrets.MM_DESKTOP_RELEASE_WEBHOOK_URL }} || echo "NOFICATION FAILED! check logs as this will succeed intentionally" diff --git a/scripts/generate_release_post.sh b/scripts/generate_release_post.sh index 390a9519..e5984e77 100755 --- a/scripts/generate_release_post.sh +++ b/scripts/generate_release_post.sh @@ -5,16 +5,11 @@ VERSION="$1" # such as 5.3.0-rc.1, 5.0.0 TEMP_VERSION_FILE="$(mktemp -t temp_version_file.XXXX)" git for-each-ref --sort=creatordate --format '%(refname)' refs/tags | grep "v[0-9]\.[0-9]\.[0-9]" | grep -v mas | grep -v "v$VERSION" | sed "s/refs\/tags\/v//" > $TEMP_VERSION_FILE - -# Debugging -cat $TEMP_VERSION_FILE - LAST_VERSION="$(cat $TEMP_VERSION_FILE | tail -1)" + TEMP_CHANGES_FILE="$(mktemp -t temp_changes_file.XXXX)" git cherry -v v$LAST_VERSION v$VERSION | grep ^+ | grep "(#[0-9]\+)" > $TEMP_CHANGES_FILE -cat $TEMP_CHANGES_FILE - cat <<-MD ### [v$VERSION](https://github.com/mattermost/desktop/releases/tag/v$VERSION) :tada: Changes: