diff options
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rwxr-xr-x | travis-build.sh | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 096547f9..226ef9a6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,5 +19,5 @@ before_script: - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker build -t withgit . ; fi script: - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run --volume $HOME/.ccache:/root/.ccache withgit /bin/sh -c "cd /root && git pull && git reset origin/master --hard && ./travis-build.sh --branch $TRAVIS_BRANCH --repo \"$TRAVIS_REPO_SLUG\" --remote \"$TRAVIS_PULL_REQUEST_SLUG\" --pr-sha \"$TRAVIS_PULL_REQUEST_SHA\"" ; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run --volume $HOME/.ccache:/root/.ccache withgit /bin/sh -c "cd /root/shim && git pull && git reset origin/master --hard && ./travis-build.sh --branch $TRAVIS_BRANCH --repo \"$TRAVIS_REPO_SLUG\" --remote \"$TRAVIS_PULL_REQUEST_SLUG\" --pr-sha \"$TRAVIS_PULL_REQUEST_SHA\"" ; fi - ccache -s diff --git a/travis-build.sh b/travis-build.sh index f885a9a4..fc9d7587 100755 --- a/travis-build.sh +++ b/travis-build.sh @@ -58,4 +58,5 @@ if [[ -n "${remote_repo}" ]] ; then git fetch remote git checkout -f ${commit_id} fi +git reset --hard "${origin_branch} make EFIDIR=test ENABLE_SHIM_CERT=1 ENABLE_HTTBOOT=1 ARCH=x86_64 clean all |