diff --git a/.travis.yml b/.travis.yml index f13ed8a..af62cd3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,6 +22,7 @@ env: global: - secure: "1rVLsDcb7dFdgyB9D1JQDr4JhWSosoMvgYgrqZNPxJ/Du3qtY3bk6dgQim+g2fDMQpDOPCQ/EhmhtrLJrIgBhhvOcsrVKT8gl9ZnATw5tHGI6XTw3eod8WgsU8owlc7CaT3XaUgwVshmW3oB/257SDf6kHwsCv/gAJuCEL5RZp76BhTWsfyeDCgz5XXgWx4a21tcIWz96jxEsrYQKLLV2ne55CxU5Hw9IMU7Ig7pkGoYCf1g+iUEA39NC8nIrQibUoJj3yNB2u3ZFwGf2LuDjjkSIsyYWn1LzA2fQYw5uAcjiQ/aDkj6sAEvwrWsIsJhOon5cQBFIU6cIIN2oK3A7BA0zJj0EsTFPUMIeryyoqiuLUDoIvHD/eEqouNduP6Kml02Ql0pDZnjDy/+nzp2e7VA5Sd9Xg1XKd1mmHKx4nc2U+IcIDZWAerFKcqQqeZSwzz5igv07w5zYZ99KCSBMH2K/2H/CNekHa6SQQ29mC8D3lDXOfwEq3fAhsabgUGe2uAgUY1nKwJBKEi7r+KEROBr5ydkWenzbCXv3GNNsuCHKpNFuoZv3QMyjUjlPBxZVndNLSv85juhkBx6wXAh8CxTt78Y8GV0xI8oazSM065gpDmENGVqyO1bUn2CZF8YRC4MLfHK+245QN82ui+YOqVudTX8RGWnX0GFUncjaRQ=" - DEFOLD_USER=bjorn.ritzl@king.com + - DEFOLD_BOOSTRAP_COLLECTION=/test/test.collectionc script: - - "./.test/run.sh" + - "./.travis/run.sh" diff --git a/.test/run.sh b/.travis/run.sh similarity index 68% rename from .test/run.sh rename to .travis/run.sh index 1e3e35f..f741b50 100755 --- a/.test/run.sh +++ b/.travis/run.sh @@ -5,30 +5,39 @@ else PLATFORM="$1" fi + echo "${PLATFORM}" # {"version": "1.2.89", "sha1": "5ca3dd134cc960c35ecefe12f6dc81a48f212d40"} +# Get SHA1 of the current Defold stable release SHA1=$(curl -s http://d.defold.com/stable/info.json | sed 's/.*sha1": "\(.*\)".*/\1/') echo "Using Defold dmengine_headless version ${SHA1}" -#DMENGINE_URL="http://d.defold.com/archive/${SHA1}/engine/linux/dmengine_headless" +# Create dmengine_headless and bob.jar URLs DMENGINE_URL="http://d.defold.com/archive/${SHA1}/engine/${PLATFORM}/dmengine_headless" BOB_URL="http://d.defold.com/archive/${SHA1}/bob/bob.jar" +# Download dmengine_headless echo "Downloading ${DMENGINE_URL}" curl -o dmengine_headless ${DMENGINE_URL} chmod +x dmengine_headless +# Download bob.jar echo "Downloading ${BOB_URL}" curl -o bob.jar ${BOB_URL} +# Fetch libraries if DEFOLD_AUTH and DEFOLD_USER are set if [ -n "${DEFOLD_AUTH}" ] && [ -n "${DEFOLD_USER}" ]; then echo "Running bob.jar - resolving dependencies" java -jar bob.jar --auth "${DEFOLD_AUTH}" --email "${DEFOLD_USER}" resolve fi echo "Running bob.jar - building" -java -jar bob.jar --debug build +java -jar bob.jar --debug build --keep-unused echo "Starting dmengine_headless" -./dmengine_headless +if [ - "${DEFOLD_BOOSTRAP_COLLECTION}" ]; then + ./dmengine_headless --config=bootstrap.main_collection=${DEFOLD_BOOSTRAP_COLLECTION} +else + ./dmengine_headless +fi