Try to fold the git diffs

This commit is contained in:
Ben Lye 2019-09-29 16:49:27 +01:00
parent 53920a9955
commit 309e34ee01

View File

@ -42,7 +42,7 @@ before_install:
arduino --install-boards multi4in1:avr;
fi
#
- buildMulti() { git diff Multiprotocol/_Config.h; exitcode=0; BUILDCMD="arduino --verify --board $BOARD Multiprotocol/Multiprotocol.ino --pref build.path=./build/"; echo $BUILDCMD; $BUILDCMD; if [ $? -ne 0 ]; then exitcode=1; fi; echo; return $exitcode; }
- buildMulti() { start_fold config_diff; travis_time_start; git diff Multiprotocol/_Config.h; end_fold config_diff; exitcode=0; BUILDCMD="arduino --verify --board $BOARD Multiprotocol/Multiprotocol.ino --pref build.path=./build/"; echo $BUILDCMD; $BUILDCMD; if [ $? -ne 0 ]; then exitcode=1; fi; echo; return $exitcode; }
- buildProtocol() { exitcode=0; opt_disable $ALL_PROTOCOLS; opt_enable $1; buildMulti; if [ $? -ne 0 ]; then exitcode=1; fi; return $exitcode; }
- buildEachProtocol() { exitcodesum=0; for PROTOCOL in $ALL_PROTOCOLS ; do echo Building $PROTOCOL; buildProtocol $PROTOCOL; if [ $? -ne 0 ]; then exitcodesum=$((exitcodesum + 1)); fi; done; return $exitcodesum; }
#
@ -86,6 +86,12 @@ before_script:
opt_enable FRSKYX_CC2500_INO AFHDS2A_A7105_INO MJXQ_NRF24L01_INO DSM_CYRF6936_INO;
fi
#
- export -f travis_fold
- export -f travis_nanoseconds
- export -f travis_time_start
- export -f travis_time_finish
- start_fold() { echo -e "travis_fold:start:$1"; }
- end_fold() { echo -e "\ntravis_fold:end:$1\r"; }
script:
# Build with all protocols enabled for STM32; a subset of protocols for Atmega
- buildMulti
@ -113,25 +119,30 @@ before_deploy:
- cp ./_Config.h.bak Multiprotocol/_Config.h
# Build the release files for OrangeRX
- if [[ "$BOARD" == "multi4in1:avr:multixmega32d4" ]]; then
echo -e "\nBuilding multi-orangerx-aetr-green-inv-$TRAVIS_TAG.bin\n";
opt_enable $ALL_PROTOCOLS;
opt_disable ORANGE_TX_BLUE;
buildMulti;
mv build/Multiprotocol.ino.hex ./binaries/multi-orangerx-aetr-green-inv-$TRAVIS_TAG.hex;
echo -e "\nBuilding multi-orangerx-aetr-blue-inv-$TRAVIS_TAG.bin\n";
opt_enable ORANGE_TX_BLUE;
buildMulti;
mv build/Multiprotocol.ino.hex ./binaries/multi-orangerx-aetr-blue-inv-$TRAVIS_TAG.hex;
fi
# Build the release files for AVR without bootloader
- if [[ "$BOARD" == "multi4in1:avr:multiatmega328p:bootloader=none" ]]; then
echo -e "\nBuilding multi-avr-usbasp-aetr-A7105-inv-$TRAVIS_TAG.bin\n";
opt_disable CHECK_FOR_BOOTLOADER;
opt_disable $ALL_PROTOCOLS;
opt_enable $A7105_PROTOCOLS;
buildMulti;
mv build/Multiprotocol.ino.hex ./binaries/multi-avr-usbasp-aetr-A7105-inv-$TRAVIS_TAG.hex;
echo -e "\nBuilding multi-avr-usbasp-aetr-CC2500-inv-$TRAVIS_TAG.bin\n";
opt_disable $ALL_PROTOCOLS;
opt_enable $CC2500_PROTOCOLS;
buildMulti;
mv build/Multiprotocol.ino.hex ./binaries/multi-avr-usbasp-aetr-CC2500-inv-$TRAVIS_TAG.hex;
echo -e "\nBuilding multi-avr-usbasp-aetr-CYRF6936-inv-$TRAVIS_TAG.bin\n";
opt_disable $ALL_PROTOCOLS;
opt_enable $CYRF6936_PROTOCOLS;
buildMulti;
@ -139,15 +150,18 @@ before_deploy:
fi
# Build the release files for AVR with bootloader
- if [[ "$BOARD" == "multi4in1:avr:multiatmega328p:bootloader=optiboot" ]]; then
echo -e "\nBuilding multi-avr-txflash-aetr-A7105-inv-$TRAVIS_TAG.hex\n";
opt_enable CHECK_FOR_BOOTLOADER;
opt_disable $ALL_PROTOCOLS;
opt_enable $A7105_PROTOCOLS;
buildMulti;
mv build/Multiprotocol.ino.hex ./binaries/multi-avr-txflash-aetr-A7105-inv-$TRAVIS_TAG.hex;
echo -e "\nBuilding multi-avr-txflash-aetr-CC2500-inv-$TRAVIS_TAG.hex\n";
opt_disable $ALL_PROTOCOLS;
opt_enable $CC2500_PROTOCOLS;
buildMulti;
mv build/Multiprotocol.ino.hex ./binaries/multi-avr-txflash-aetr-CC2500-inv-$TRAVIS_TAG.hex;
echo -e "\nBuilding multi-avr-txflash-aetr-CYRF6936-inv-$TRAVIS_TAG.hex\n";
opt_disable $ALL_PROTOCOLS;
opt_enable $CYRF6936_PROTOCOLS;
buildMulti;
@ -155,59 +169,73 @@ before_deploy:
fi
# Build the release files for STM32 without debug
- if [[ "$BOARD" == "multi4in1:STM32F1:multistm32f103c:debug_option=none" ]]; then
echo -e "\nBuilding multi-stm-erskytx-aetr-inv-$TRAVIS_TAG.bin\n";
opt_enable CHECK_FOR_BOOTLOADER;
opt_enable $ALL_PROTOCOLS;
opt_enable MULTI_STATUS;
opt_disable MULTI_TELEMETRY;
buildMulti;
mv build/Multiprotocol.ino.bin ./binaries/multi-stm-erskytx-aetr-inv-$TRAVIS_TAG.bin;
echo -e "\nBuilding multi-stm-erskytx-taer-inv-$TRAVIS_TAG.bin\n";
opt_replace AETR TAER;
buildMulti;
mv build/Multiprotocol.ino.bin ./binaries/multi-stm-erskytx-taer-inv-$TRAVIS_TAG.bin;
echo -e "\nBuilding multi-stm-erskytx-reta-inv-$TRAVIS_TAG.bin\n";
opt_replace TAER RETA;
buildMulti;
mv build/Multiprotocol.ino.bin ./binaries/multi-stm-erskytx-reta-inv-$TRAVIS_TAG.bin;
echo -e "\nBuilding multi-stm-erskytx-aetr-noinv-$TRAVIS_TAG.bin\n";
opt_replace RETA AETR;
opt_disable INVERT_TELEMETRY;
buildMulti;
mv build/Multiprotocol.ino.bin ./binaries/multi-stm-erskytx-aetr-noinv-$TRAVIS_TAG.bin;
echo -e "\nBuilding multi-stm-erskytx-taer-noinv-$TRAVIS_TAG.bin\n";
opt_replace AETR TAER;
buildMulti;
mv build/Multiprotocol.ino.bin ./binaries/multi-stm-erskytx-taer-noinv-$TRAVIS_TAG.bin;
echo -e "\nBuilding multi-stm-erskytx-reta-noinv-$TRAVIS_TAG.bin\n";
opt_replace TAER RETA;
buildMulti;
mv build/Multiprotocol.ino.bin ./binaries/multi-stm-erskytx-reta-noinv-$TRAVIS_TAG.bin;
echo -e "\nBuilding multi-stm-opentx-aetr-inv-$TRAVIS_TAG.bin\n";
opt_replace RETA AETR;
opt_disable MULTI_STATUS;
opt_enable MULTI_TELEMETRY;
opt_enable INVERT_TELEMETRY;
buildMulti;
mv build/Multiprotocol.ino.bin ./binaries/multi-stm-opentx-aetr-inv-$TRAVIS_TAG.bin;
echo -e "\nBuilding multi-stm-opentx-taer-inv-$TRAVIS_TAG.bin\n";
opt_replace AETR TAER;
buildMulti;
mv build/Multiprotocol.ino.bin ./binaries/multi-stm-opentx-taer-inv-$TRAVIS_TAG.bin;
echo -e "\nBuilding multi-stm-opentx-reta-inv-$TRAVIS_TAG.bin\n";
opt_replace TAER RETA;
buildMulti;
mv build/Multiprotocol.ino.bin ./binaries/multi-stm-opentx-reta-inv-$TRAVIS_TAG.bin;
echo -e "\nBuilding multi-stm-opentx-aetr-noinv-$TRAVIS_TAG.bin\n";
opt_replace RETA AETR;
opt_disable INVERT_TELEMETRY;
buildMulti;
mv build/Multiprotocol.ino.bin ./binaries/multi-stm-opentx-aetr-noinv-$TRAVIS_TAG.bin;
echo -e "\nBuilding multi-stm-opentx-taer-noinv-$TRAVIS_TAG.bin\n";
opt_replace AETR TAER;
buildMulti;
mv build/Multiprotocol.ino.bin ./binaries/multi-stm-opentx-taer-noinv-$TRAVIS_TAG.bin;
echo -e "\nBuilding multi-stm-opentx-reta-noinv-$TRAVIS_TAG.bin\n";
opt_replace TAER RETA;
buildMulti;
mv build/Multiprotocol.ino.bin ./binaries/multi-stm-opentx-reta-noinv-$TRAVIS_TAG.bin;
fi
# Build the release files for STM32 with Native USB debugging
- if [[ "$BOARD" == "multi4in1:STM32F1:multistm32f103c:debug_option=native" ]]; then
echo -e "\nBuilding multi-stm-erskytx-aetr-inv-usbdebug-$TRAVIS_TAG.bin\n";
opt_enable CHECK_FOR_BOOTLOADER;
opt_enable $ALL_PROTOCOLS;
opt_enable MULTI_STATUS;
opt_disable MULTI_TELEMETRY;
buildMulti;
mv build/Multiprotocol.ino.bin ./binaries/multi-stm-erskytx-aetr-inv-usbdebug-$TRAVIS_TAG.bin;
echo -e "\nBuilding multi-stm-opentx-aetr-inv-usbdebug-$TRAVIS_TAG.bin\n";
opt_disable MULTI_STATUS;
opt_enable MULTI_TELEMETRY;
buildMulti;
@ -215,12 +243,14 @@ before_deploy:
fi
# Build the release files for STM32 with FTDI USB debugging
- if [[ "$BOARD" == "multi4in1:STM32F1:multistm32f103c:debug_option=ftdi" ]]; then
echo -e "\nBuilding multi-stm-erskytx-aetr-inv-ftdidebug-$TRAVIS_TAG.bin\n";
opt_enable CHECK_FOR_BOOTLOADER;
opt_enable $ALL_PROTOCOLS;
opt_enable MULTI_STATUS;
opt_disable MULTI_TELEMETRY;
buildMulti;
mv build/Multiprotocol.ino.bin ./binaries/multi-stm-erskytx-aetr-inv-ftdidebug-$TRAVIS_TAG.bin;
echo -e "\nBuilding multi-stm-opentx-aetr-inv-ftdidebug-$TRAVIS_TAG.bin\n";
opt_disable MULTI_STATUS;
opt_enable MULTI_TELEMETRY;
buildMulti;