Merge pull request #845 from wren/stop-changelog-pile-up

Stop multipe changelog generators from crashing into each other

.build/generate_changelog.sh

@@ -1,5 +1,20 @@
 #!/usr/bin/env bash
 
+BRANCH=$TRAVIS_BRANCH
+if [[ $TRAVIS_BRANCH == $TRAVIS_TAG ]]; then
+  BRANCH='master'
+fi
+
+# Check if branch has been updated since this build started
+# This tends to happen if multiple things have been merged in at the same time.
+if [[ -z $TRAVIS_TAG ]]; then
+  git fetch origin
+  if [[ $(git rev-parse "origin/${BRANCH}") != $TRAVIS_COMMIT ]]; then
+    echo "${BRANCH} has been updated since build started. Aborting changelog."
+    exit 0
+  fi
+fi
+
 FILENAME='CHANGELOG.md'
 
 # get the latest git tags
@@ -40,11 +55,6 @@ docker run -it --rm -v "$(pwd)":/usr/local/src/your-app ferrarimarco/github-chan
 # Put back our link (instead of the broken one)
 sed -i 's!https://pypi.org/project/jrnl/HEAD/!https://github.com/jrnl-org/jrnl/!' "$FILENAME"
 
-BRANCH=$TRAVIS_BRANCH
-if [[ $TRAVIS_BRANCH == $TRAVIS_TAG ]]; then
-  BRANCH='master'
-fi
-
 git config --global user.email "jrnl.bot@gmail.com"
 git config --global user.name "Jrnl Bot"
 git checkout $BRANCH

.travis.yml

@@ -9,14 +9,8 @@ git:
   depth: false
   autocrlf: false
 
-addons:
-  apt:
-    packages:
-      - tree
-
 before_install:
   - date
-  - tree
 
 install:
   - pip install poetry