summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml17
-rwxr-xr-x.travis/webhook.sh9
2 files changed, 12 insertions, 14 deletions
diff --git a/.travis.yml b/.travis.yml
index ce3402ecf..93c52939a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,13 +4,11 @@ os:
- osx
install:
- |-
- path="$(pwd)"; cd;
- git clone https://github.com/rednex/rgbds &&
- cd rgbds &&
- sudo make install &&
- cd - &&
- rm -rf rgbds &&
- cd "$path"
+ ( cd
+ git clone --depth=1 https://github.com/rednex/rgbds
+ sudo make -C rgbds CFLAGS=-O2 install
+ rm -rf rgbds
+ )
before_script:
- |-
function check_status() {
@@ -24,4 +22,7 @@ script:
- make -j2 compare
- check_status
after_success:
- - .travis/webhook.sh
+ - |-
+ if [ "$TRAVIS_BRANCH" = master -a "$TRAVIS_PULL_REQUEST" = false -a "$TRAVIS_OS_NAME" = linux ]; then
+ ./.travis/webhook.sh
+ fi
diff --git a/.travis/webhook.sh b/.travis/webhook.sh
index 032e2231a..3fe33bff0 100755
--- a/.travis/webhook.sh
+++ b/.travis/webhook.sh
@@ -1,13 +1,10 @@
#!/bin/sh
+set -e
-# Only run this script if it's the master branch build.
-[ "$TRAVIS_BRANCH" != 'master' -o "$TRAVIS_PULL_REQUEST" != 'false' ] && exit
-
-root="$(realpath "$(dirname "$0")/..")"
-content=""
+root="$(readlink -e "$(dirname "$0")/..")"
# Report unnamed symbols
-content+="$("$root/tools/unnamed.py" -r "$root" "$root/pokecrystal.sym" | grep -v -e '^lib/mobile/' -e '^mobile/' | head)"
+content="$("$root/tools/unnamed.py" -r "$root" "$root/pokecrystal.sym" | grep -v -e '^lib/mobile/' -e '^mobile/' | head)"
curl -H 'Content-Type: application/json' -X POST "$POKECRYSTAL_DISCORD_WEBHOOK_URL" -d@- << EOF
{