Merge pull request #600 from mid-kid/master

Fix travis
This commit is contained in:
Rangi 2019-02-09 20:09:25 -05:00 committed by GitHub
commit d9d688df4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 14 deletions

View File

@ -4,13 +4,11 @@ os:
- osx - osx
install: install:
- |- - |-
path="$(pwd)"; cd; ( cd
git clone https://github.com/rednex/rgbds && git clone --depth=1 https://github.com/rednex/rgbds
cd rgbds && sudo make -C rgbds CFLAGS=-O2 install
sudo make install && rm -rf rgbds
cd - && )
rm -rf rgbds &&
cd "$path"
before_script: before_script:
- |- - |-
function check_status() { function check_status() {
@ -24,4 +22,7 @@ script:
- make -j2 compare - make -j2 compare
- check_status - check_status
after_success: after_success:
- .travis/webhook.sh - |-
if [ "$TRAVIS_BRANCH" = master -a "$TRAVIS_PULL_REQUEST" = false -a "$TRAVIS_OS_NAME" = linux ]; then
./.travis/webhook.sh
fi

View File

@ -1,13 +1,10 @@
#!/bin/sh #!/bin/sh
set -e
# Only run this script if it's the master branch build. root="$(readlink -e "$(dirname "$0")/..")"
[ "$TRAVIS_BRANCH" != 'master' -o "$TRAVIS_PULL_REQUEST" != 'false' ] && exit
root="$(realpath "$(dirname "$0")/..")"
content=""
# Report unnamed symbols # 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 curl -H 'Content-Type: application/json' -X POST "$POKECRYSTAL_DISCORD_WEBHOOK_URL" -d@- << EOF
{ {