diff --git a/.travis.yml b/.travis.yml index 1ef94eb..d8f0a1f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,12 +33,8 @@ branches: jdk: - oraclejdk8 -# Check they had a ticket with this change before_install: -- chmod +x ./org.eclipse.richbeans.releng/build/commit-msg.sh -- bash ./org.eclipse.richbeans.releng/build/commit-msg.sh - -# Stat xvfb, this allows SWTBot to execute in tests. +# Start XVFB, this allows SWTBot to execute in tests. - export DISPLAY=:99.0 - sh -e /etc/init.d/xvfb start - sleep 3 # give xvfb some time to start as per the travis docs diff --git a/org.eclipse.richbeans.releng/build/commit-msg.sh b/org.eclipse.richbeans.releng/build/commit-msg.sh deleted file mode 100644 index c5476c2..0000000 --- a/org.eclipse.richbeans.releng/build/commit-msg.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env bash - -last_msg="$(git log -1 --pretty=%B)" -echo "The last commit was: $last_msg" - - -# We check the last commit message has a ticket -if [[ $last_msg =~ ^Merge.*|^merge.*|.*(richbeans/issues/[0-9]+).* ]]; then - echo "Github issue found, build may proceed" - exit 0 -fi - -# Couldn't find ticket or merge, fail build -error_msg="Aborting build. Your commit message must reference a github issue" -echo "$error_msg" >&2 - -# Get the last user -id="$(git log --format="%H" -n 1)" -user="$(git show --format="%aN <%aE>" $id)" -echo "Last commit from:" -echo " $user" - -exit 1