diff --git a/.travis.yml b/.travis.yml index bf70a93024..3a5c58c603 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,15 +12,12 @@ before_script: /home/travis/.luarocks/bin/luacheck . --no-color -qo "011" script: - if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]]; then ./wowace_translations.sh; fi - | + ./generate_changelog.sh if [[ "$TRAVIS_TAG" == "8.0-"* ]]; then - ./generate_changelog.sh curl -s https://raw.githubusercontent.com/BigWigsMods/packager/master/release.sh | bash -s -- -o -p 65387 -g 8.0.1 + else + curl -s https://raw.githubusercontent.com/BigWigsMods/packager/master/release.sh | bash -s -- -o -p 65387 fi - # - | - # if [[ "$TRAVIS_TAG" != "8.0-"* ]]; then - # ./generate_changelog.sh - # curl -s https://raw.githubusercontent.com/BigWigsMods/packager/master/release.sh | bash -s -- -o -p 65387 - # fi notifications: email: diff --git a/generate_changelog.sh b/generate_changelog.sh index 2644f832d5..9fde5c4c31 100755 --- a/generate_changelog.sh +++ b/generate_changelog.sh @@ -16,7 +16,7 @@ url=$( git remote get-url origin | sed -e 's/^git@\(.*\):/https:\/\/\1\//' -e 's #title='# '${url##*/} title="# WeakAuras 2" -echo -ne "$title\n\n## [${version}](${url}/tree/${current}) ($date)\n\n[Full Changelog](${url}/compare/${previous}...${current})\n\n" > "CHANGELOG.md" +echo -ne "# [${version}](${url}/tree/${current}) ($date)\n\n[Full Changelog](${url}/compare/${previous}...${current})\n\n" > "CHANGELOG.md" git shortlog --no-merges --reverse "$previous..$current" | sed -e '/^\w/G' -e 's/^ /- /' >> "CHANGELOG.md" #git log --pretty=format:"###%s" "$previous..$current" | sed -e 's/^/ /g' -e 's/^ *$//g' -e 's/^ ###/- /g' -e 's/$/ /' >> "CHANGELOG.md" #echo >> "CHANGELOG.md"