Fix the working directory we start in.

Signed-off-by: Peter Jones <pjones@redhat.com>

diff --git a/.travis.yml b/.travis.yml
index 096547f9bcc82b35f58071fc96d6bc21c38b58cf..226ef9a69fd4002a22e175e3c22c39aff27deb32 100644 (file)
--- 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 f885a9a46dd0004b8b1d1862cf122b85ba6f73e7..fc9d7587a0d68b4ce77500674e732ce0ee6d7422 100755 (executable)
--- 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