Wrong branch ...

tools/nightly21/build-nightly.sh

@@ -1,58 +0,0 @@
-#!/bin/bash
- 
-set -e
-
-branch=master
-docker=nightly21
-destdir=/var/www/html/2.1/nightly
-workdir=/home/opentx/nightly21
-version=21
-
-# Incrementnightly index
-index=`cat index.txt`
-index=`expr $index + 1`
-echo $index > index.txt
-suffix="N$index"
-
-cd ${workdir}
-
-# Call sdcard generation
-code/tools/nightly22/build-sdcard.sh
-
-# Create on-demand build environment
-cp code/radio/util/Dockerfile .
-docker build -t new-$docker --build-arg OPENTX_VERSION_SUFFIX=$suffix .
-docker rmi $docker || true
-docker tag new-$docker $docker 
-docker rmi new-$docker
-
-# Make stamps
-docker run -dit --name compiler21  -v /home/opentx/$docker:/opentx $docker
-docker exec compiler21 make -C /opentx/code/radio/src opentx-stamp
-cp -f $rundir/code/radio/src/stamp-opentx.txt $destdir/firmware
-cp -f $rundir/code/radio/releasenotes.txt $destdir/firmware
-
-# Build Linux companion
-cp binaries/stamp-opentx.txt $output/firmware
-docker exec compiler21 rm -rf build
-docker exec compiler21 /opentx/code/tools/build-companion.sh /opentx/code /opentx/binaries/ $suffix
-docker stop compiler21
-docker rm compiler21
-cp binaries/*.deb $output/companion/linux/
-
-# Clean binaries It will be hosting built on demand firmware
-rm -rf binaries/*
-rm -rf binaries/.lock
-
-rel=`grep "VERS_STR" $rundir/code/radio/src/stamp-opentx.h | cut -d' ' -f3 | tr -d '"'`
-
-# Request companion compilation on Windows
-cd $output/companion/windows
-wget -qO- http://winbox.open-tx.org/companion-builds/compile21.php?branch=master\&suffix=${suffix}
-wget -O companion-windows-${rel}.exe http://winbox.open-tx.org/companion-builds/companion-windows-${rel}.exe
-
-# Update windows stamp
-rm -f companion-windows.stamp
-echo "#define VERSION  "'"$rel'"' >> companion-windows.stamp
-
-

tools/nightly21/build-sdcard.sh

@@ -1,43 +0,0 @@
-#!/bin/bash
- 
-set -e
-
-branch=master
-workdir=/home/opentx/nightly21
-output=/var/www/html/2.1/nightly
-
-cd ${workdir}
-
-# Copy git sdcard data
-rm -Rf ${workdir}/sdcard
-cp -r ${workdir}/code/radio/sdcard .
-
-# Request sound pack generation
-wget -qO- http://winbox.open-tx.org/voice-builds/compile21.php?branch=${branch}
-
-# Get sounds
-cd sdcard
-wget http://winbox.open-tx.org/voice-builds/english-irish-taranis.zip
-wget http://winbox.open-tx.org/voice-builds/english-scottish-taranis.zip
-wget http://winbox.open-tx.org/voice-builds/english-american-taranis.zip
-wget http://winbox.open-tx.org/voice-builds/english-australian-taranis.zip
-wget http://winbox.open-tx.org/voice-builds/english-english-taranis.zip
-wget http://winbox.open-tx.org/voice-builds/french-taranis.zip
-
-# Prepare the sdcard zip files for Taranis
-unzip english-irish-taranis.zip -d  ${workdir}/sdcard/taranis
-mv ${workdir}/sdcard/horus/SOUNDS/en ${workdir}/sdcard/taranis/SOUNDS/en-irish
-unzip english-scottish-taranis.zip -d  ${workdir}/sdcard/taranis
-mv ${workdir}/sdcard/horus/SOUNDS/en ${workdir}/sdcard/taranis/SOUNDS/en-scottish
-unzip english-australian-taranis.zip -d  ${workdir}/sdcard/taranis
-mv ${workdir}/sdcard/horus/SOUNDS/en ${workdir}/sdcard/taranis/SOUNDS/en-australian
-unzip english-american-taranis.zip -d  ${workdir}/sdcard/taranis
-mv ${workdir}/sdcard/horus/SOUNDS/en ${workdir}/sdcard/taranis/SOUNDS/en-american
-unzip english-english-taranis -d  ${workdir}/sdcard/taranis
-unzip french-taranis.zip -d  ${workdir}/sdcard/taranis
-wget -O ${workdir}/sdcard/taranis/SOUNDS/en/english.cvs http://winbox.open-tx.org/voice-builds/english-english-taranis.csv
-wget -O ${workdir}/sdcard/taranis/SOUNDS/fr/french.cvs http://winbox.open-tx.org/voice-builds/french-taranis.csv
-
-rm -f ${workdir}/sdcard/*.zip
-cd ${workdir}/sdcard/taranis && zip -r ${output}/sdcard/sdcard-taranis.zip *
-rm -Rf ${workdir}/sdcard