From 65c55bae072ccec35e098ab2c8b0113a734e65f9 Mon Sep 17 00:00:00 2001 From: Oliver Hamlet Date: Mon, 7 Dec 2015 13:21:03 +0000 Subject: [PATCH] Remove unnecessary CMake modules from Travis script --- .travis.yml | 4 ++-- scripts/install-step.travis.sh | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3138a942..4b10c77c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,8 +35,8 @@ before_script: - cd googletest-release-1.7.0 - cmake . - make - # Move back into the cloned LOOT repo path. - - cd $TRAVIS_BUILD_DIR/build + # Move into the cloned LOOT repo build path. + - mkdir $TRAVIS_BUILD_DIR/build && cd $TRAVIS_BUILD_DIR/build # Fetch plugins to test with. - wget https://github.com/WrinklyNinja/testing-plugins/archive/1.0.0.tar.gz -O - | tar -xz - mv testing-plugins-1.0.0/* ./ diff --git a/scripts/install-step.travis.sh b/scripts/install-step.travis.sh index 3ea16c12..99686965 100644 --- a/scripts/install-step.travis.sh +++ b/scripts/install-step.travis.sh @@ -1,10 +1,7 @@ #!/bin/bash set -ev -# Currently inside the cloned repo path. -# Get the 3rd-party CMake modules. -wget -P build https://raw.githubusercontent.com/rpavlik/cmake-modules/master/GetGitRevisionDescription.cmake -wget -P build https://raw.githubusercontent.com/rpavlik/cmake-modules/master/GetGitRevisionDescription.cmake.in +# Move out of LOOT repo path. cd ../.. # Install libespm.