mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-20 06:12:57 +01:00
Code Issues Releases Wiki Activity

Add docker64 entry to travis scripts

Browse Source
This commit is contained in:
Michał Janiszewski
2016-10-15 22:24:24 +02:00
parent 6c8c1a90fe
commit 8266c08215
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/linux/build.sh
View File

@@ -61,7 +61,14 @@ pushd build
chmod a+rwx $(pwd) chmod a+rwx $(pwd)
chmod g+s $(pwd) chmod g+s $(pwd)
# CMAKE and MAKE opts from environment # CMAKE and MAKE opts from environment
docker run -u travis -v $PARENT:/work/openrct2 -w /work/openrct2/build -i -t openrct2/openrct2:32bit-only bash -c "cmake ../ $OPENRCT2_CMAKE_OPTS && make $OPENRCT_MAKE_OPTS" docker run -u travis -v $PARENT:/work/openrct2 -w /work/openrct2/build -i -t openrct2/openrct2:32bit-only bash -c "cmake ../ -DFORCE32=on $OPENRCT2_CMAKE_OPTS && make $OPENRCT_MAKE_OPTS"
elif [[ $TARGET == "docker64" ]]
then
PARENT=$(readlink -f ../)
chmod a+rwx $(pwd)
chmod g+s $(pwd)
# CMAKE and MAKE opts from environment
docker run -v $PARENT:/work/openrct2 -w /work/openrct2/build -i -t openrct2/openrct2:64bit-only bash -c "cmake ../ $OPENRCT2_CMAKE_OPTS && make $OPENRCT_MAKE_OPTS"
else else
cmake $OPENRCT2_CMAKE_OPTS .. cmake $OPENRCT2_CMAKE_OPTS ..
# NOT the same variable as above # NOT the same variable as above

3
scripts/linux/install.sh
View File

@@ -189,6 +189,9 @@ elif [[ $(uname) == "Linux" ]]; then
"docker32") "docker32")
docker pull openrct2/openrct2:32bit-only docker pull openrct2/openrct2:32bit-only
;; ;;
"docker64")
docker pull openrct2/openrct2:64bit-only
;;
*) *)
echo "unkown target $TARGET" echo "unkown target $TARGET"
exit 1 exit 1