From 92160b63f36ad9201af28f35bc9486d842704202 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Sun, 12 Nov 2017 23:27:29 +0100 Subject: [PATCH] chmod whole build directory on Travis --- scripts/linux/build.sh | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/scripts/linux/build.sh b/scripts/linux/build.sh index 1b3b8d0c5b7d..ae8fc037b4e4 100755 --- a/scripts/linux/build.sh +++ b/scripts/linux/build.sh @@ -19,34 +19,26 @@ if [[ ! -d build ]]; then mkdir -p build fi +PARENT=$(readlink -f ./) +chmod -R a+rwX "$(pwd)" +chmod -R g+s "$(pwd)" + pushd build echo OPENRCT2_CMAKE_OPTS = "$OPENRCT2_CMAKE_OPTS" if [[ $TARGET == "docker64" ]] then - PARENT=$(readlink -f ../) - chmod a+rwx "$(pwd)" - chmod g+s "$(pwd)" # CMAKE and MAKE opts from environment docker run -v "$PARENT":"$PARENT" -w "$PARENT"/build -i -t openrct2/openrct2:64bit-only bash -c "cmake ../ -DWITH_TESTS=on $OPENRCT2_CMAKE_OPTS && ninja $OPENRCT_MAKE_OPTS && ctest --output-on-failure" elif [[ $TARGET == "ubuntu_i686" ]] then - PARENT=$(readlink -f ../) - chmod a+rwx "$(pwd)" - chmod g+s "$(pwd)" # CMAKE and MAKE opts from environment docker run -v "$PARENT":"$PARENT" -w "$PARENT"/build -i -t openrct2/openrct2:ubuntu_i686 bash -c "cmake ../ -DWITH_TESTS=on $OPENRCT2_CMAKE_OPTS && ninja all testpaint install $OPENRCT_MAKE_OPTS && ctest --output-on-failure && ( ./testpaint --quiet || if [[ \$? -eq 1 ]] ; then echo Allowing failed tests to pass ; else echo here ; false; fi )" elif [[ $TARGET == "ubuntu_amd64" ]] then - PARENT=$(readlink -f ../) - chmod a+rwx "$(pwd)" - chmod g+s "$(pwd)" # CMAKE and MAKE opts from environment docker run -v "$PARENT":"$PARENT" -w "$PARENT"/build -i -t openrct2/openrct2:ubuntu_amd64 bash -c "cmake ../ -DWITH_TESTS=on $OPENRCT2_CMAKE_OPTS && ninja $OPENRCT_MAKE_OPTS install && ctest --output-on-failure" elif [[ $TARGET == "windows" ]] then - PARENT=$(readlink -f ../) - chmod a+rwx "$(pwd)" - chmod g+s "$(pwd)" # CMAKE and MAKE opts from environment docker run -v "$PARENT":"$PARENT" -w "$PARENT"/build -i -t openrct2/openrct2:mingw-arch bash -c "cmake ../ $OPENRCT2_CMAKE_OPTS && ninja $OPENRCT_MAKE_OPTS" else