diff --git a/tools/nightly23/build-nightly.sh b/tools/nightly23/build-nightly.sh index d1458fdf0..4bb42e3ff 100755 --- a/tools/nightly23/build-nightly.sh +++ b/tools/nightly23/build-nightly.sh @@ -8,24 +8,24 @@ workdir=/home/opentx/nightly23 output=/var/www/html/2.3/nightlies version=2.3.0 -# Incrementnightly index +echo "Increment nightly index" index=`cat index.txt` index=`expr $index + 1` suffix="N$index" cd ${workdir} -# Create on-demand build environment +echo "Create on-demand build environment" cp code/radio/util/Dockerfile . docker build -t new-${docker} --build-arg OPENTX_VERSION_SUFFIX=${suffix} . docker rmi -f ${docker} || true docker tag new-${docker} ${docker} docker rmi -f new-${docker} -# Call sdcard generation +echo "Call sdcard generation" code/tools/nightly23/build-sdcard.sh -# Build Linux companion +echo "Build Linux companion" docker run -dit --name companion -v /home/opentx/${docker}:/opentx ${docker} docker exec companion sh -c "mkdir -p build && cd build && cmake /opentx/code && cp radio/src/stamp.h /opentx/binaries/stamp-opentx.txt" docker exec companion rm -rf build @@ -36,7 +36,7 @@ fi docker stop companion docker rm companion -# Request companion compilation on Windows +echo "Request companion compilation on Windows" if [ ! -f ${output}/companion/windows/companion-windows-${version}${suffix}.exe ]; then cd ${output}/companion/windows wget -qO- http://winbox.open-tx.org/companion-builds/compile23.php?branch=$branch\&suffix=${suffix} @@ -44,7 +44,7 @@ if [ ! -f ${output}/companion/windows/companion-windows-${version}${suffix}.exe chmod -Rf g+w companion-windows-${version}${suffix}.exe fi -# Request companion compilation on Mac OS X +echo "Request companion compilation on Mac OS X" if [ ! -f ${output}/companion/macosx/opentx-companion-${version}${suffix}.dmg ]; then cd ${output}/companion/macosx wget -qO- http://opentx.blinkt.de:8080/~opentx/build-opentx.py?branch=${branch}\&suffix=${suffix} @@ -52,15 +52,15 @@ if [ ! -f ${output}/companion/macosx/opentx-companion-${version}${suffix}.dmg ]; chmod -Rf g+w opentx-companion-${version}${suffix}.dmg fi -# Update stamps +echo "Update stamps" cp -f ${workdir}/binaries/stamp-opentx.txt ${output}/firmware echo "#define VERSION \"${version}${suffix}\"" > ${output}/companion/companion-windows.stamp cp -f ${output}/companion/companion-windows.stamp ${output}/companion/companion-linux.stamp cp -f ${output}/companion/companion-windows.stamp ${output}/companion/companion-macosx.stamp -# Clean binaries It will be hosting built on demand firmware +echo "Clean binaries It will be hosting built on demand firmware" rm -rf ${workdir}/binaries/* rm -rf ${workdir}/binaries/.lock -# Released is considered as valid if we get to that point +echo "Released is considered as valid if we get to that point" echo $index > ${workdir}/index.txt