From b41c598b95315a497bea9841b992b4715c6544e7 Mon Sep 17 00:00:00 2001 From: Oreo639 Date: Mon, 29 Apr 2019 18:39:54 -0700 Subject: [PATCH] Improve travis script --- .travis.yml | 9 +++++---- .travis/exportdoc.sh | 2 -- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index ae1b9c8..2533ae1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,9 +14,9 @@ cache: before_install: # Travis has an OLD doxygen build, so we fetch a recent one - export DOXY_BINPATH=/home/travis/doxygen/doxygen-1.8.15/bin - - if [ ! -e "$DOXY_BINPATH/doxygen" ]; then mkdir -p ~/doxygen && cd ~/doxygen; fi - - if [ ! -e "$DOXY_BINPATH/doxygen" ]; then wget http://doxygen.nl/files/doxygen-1.8.15.linux.bin.tar.gz; fi - - if [ ! -e "$DOXY_BINPATH/doxygen" ]; then tar xzf doxygen-1.8.15.linux.bin.tar.gz; fi + - if [ ! -e "$DOXY_BINPATH/doxygen" ] && [ "$TRAVIS_PULL_REQUEST" = "false" ]; then mkdir -p ~/doxygen && cd ~/doxygen; fi + - if [ ! -e "$DOXY_BINPATH/doxygen" ] && [ "$TRAVIS_PULL_REQUEST" = "false" ]; then wget http://doxygen.nl/files/doxygen-1.8.15.linux.bin.tar.gz; fi + - if [ ! -e "$DOXY_BINPATH/doxygen" ] && [ "$TRAVIS_PULL_REQUEST" = "false" ]; then tar xzf doxygen-1.8.15.linux.bin.tar.gz; fi - export PATH=$PATH:$DOXY_BINPATH install: @@ -24,7 +24,8 @@ install: script: - docker run -e ENABLE_COMPATIBILITY_REPORTING -v $TRAVIS_BUILD_DIR:/libctru devkitpro/devkitarm /bin/bash -ex /libctru/.travis/docker.sh - - cd $TRAVIS_BUILD_DIR + +before_deploy: - sh .travis/exportdoc.sh deploy: diff --git a/.travis/exportdoc.sh b/.travis/exportdoc.sh index 13f842e..152e7cb 100644 --- a/.travis/exportdoc.sh +++ b/.travis/exportdoc.sh @@ -1,6 +1,4 @@ #!/bin/sh -if [ -n "$TRAVIS_TAG" ] && [ "$TRAVIS_PULL_REQUEST" = "false" ]; then git clone --branch=master --single-branch --depth 1 https://github.com/devkitPro/3ds-examples examples cd libctru doxygen Doxyfile -fi