From a55aa80ad18b0a44ea13761ef2df2e886b0755ac Mon Sep 17 00:00:00 2001 From: David Date: Tue, 8 Oct 2019 10:52:55 +1000 Subject: [PATCH 1/5] Attempt to shard the longest travis task into two. --- .travis.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5b4d420c8..7f5ebc0c4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,9 +20,16 @@ notifications: jobs: include: - script: - # Check that everything compiles. - - find . -name platformio.ini -type f | sed 's,/platformio.ini$,,' | xargs -n 1 pio run --project-dir + # Check that everything compiles but some heavy tasks e.g. IRMQTTServer & IRrecvDumpV2 + # i.e. We are splitting the work load in to parallel tasks. + - find . -regextype egrep -name platformio.ini -type f \! -regex ".*IR(MQTTServer|recvDumpV2).*" | sed 's,/platformio.ini$,,' | xargs -n 1 pio run --project-dir - script: + # Check that everything else compiles. + # i.e. We are splitting the work load in to parallel tasks. + - find . -regextype egrep -name platformio.ini -type f -regex ".*IR(MQTTServer|recvDumpV2).*" | sed 's,/platformio.ini$,,' | xargs -n 1 pio run --project-dir + - script: + # Run all the Tests & check the code linters have no issues. + # i.e. We are splitting the work load in to parallel tasks. # Check the version numbers match. - LIB_VERSION=$(egrep "^#define\s+_IRREMOTEESP8266_VERSION_\s+" src/IRremoteESP8266.h | cut -d\" -f2) - test ${LIB_VERSION} == "$(jq -r .version library.json)" From 533aa6cccb70c8a6e2965d9c8e55d01b8f36c762 Mon Sep 17 00:00:00 2001 From: David Date: Tue, 8 Oct 2019 11:30:05 +1000 Subject: [PATCH 2/5] Try to make all platformio.ini files similar to speed up travis builds. --- examples/CommonAcControl/platformio.ini | 2 +- examples/ControlSamsungAC/platformio.ini | 2 +- examples/DumbIRRepeater/platformio.ini | 2 +- examples/IRGCSendDemo/platformio.ini | 2 +- examples/IRGCTCPServer/platformio.ini | 2 +- examples/IRMQTTServer/platformio.ini | 2 +- examples/IRServer/platformio.ini | 2 +- examples/IRrecvDemo/platformio.ini | 2 +- examples/IRrecvDump/platformio.ini | 2 +- examples/IRrecvDumpV2/platformio.ini | 2 +- examples/IRsendDemo/platformio.ini | 2 +- examples/IRsendProntoDemo/platformio.ini | 2 +- examples/JVCPanasonicSendDemo/platformio.ini | 2 +- examples/LGACSend/platformio.ini | 2 +- examples/SmartIRRepeater/platformio.ini | 2 +- examples/TurnOnArgoAC/platformio.ini | 2 +- examples/TurnOnDaikinAC/platformio.ini | 2 +- examples/TurnOnFujitsuAC/platformio.ini | 2 +- examples/TurnOnKelvinatorAC/platformio.ini | 2 +- examples/TurnOnMitsubishiAC/platformio.ini | 2 +- examples/TurnOnMitsubishiHeavyAc/platformio.ini | 2 +- examples/TurnOnPanasonicAC/platformio.ini | 2 +- examples/TurnOnToshibaAC/platformio.ini | 2 +- examples/TurnOnTrotecAC/platformio.ini | 2 +- examples/Web-AC-control/platformio.ini | 2 +- platformio.ini | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/examples/CommonAcControl/platformio.ini b/examples/CommonAcControl/platformio.ini index 5fd807556..e6f6320da 100644 --- a/examples/CommonAcControl/platformio.ini +++ b/examples/CommonAcControl/platformio.ini @@ -6,7 +6,7 @@ lib_extra_dirs = ../../ lib_ldf_mode = deep+ lib_ignore = examples framework = arduino -build_flags = +build_flags = ; -D_IR_LOCALE_=en-AU [env:nodemcuv2] platform = espressif8266 diff --git a/examples/ControlSamsungAC/platformio.ini b/examples/ControlSamsungAC/platformio.ini index 2d1f8f327..e6f6320da 100644 --- a/examples/ControlSamsungAC/platformio.ini +++ b/examples/ControlSamsungAC/platformio.ini @@ -6,7 +6,7 @@ lib_extra_dirs = ../../ lib_ldf_mode = deep+ lib_ignore = examples framework = arduino -build_flags = -D_IR_LOCALE_=en-AU +build_flags = ; -D_IR_LOCALE_=en-AU [env:nodemcuv2] platform = espressif8266 diff --git a/examples/DumbIRRepeater/platformio.ini b/examples/DumbIRRepeater/platformio.ini index 5fd807556..e6f6320da 100644 --- a/examples/DumbIRRepeater/platformio.ini +++ b/examples/DumbIRRepeater/platformio.ini @@ -6,7 +6,7 @@ lib_extra_dirs = ../../ lib_ldf_mode = deep+ lib_ignore = examples framework = arduino -build_flags = +build_flags = ; -D_IR_LOCALE_=en-AU [env:nodemcuv2] platform = espressif8266 diff --git a/examples/IRGCSendDemo/platformio.ini b/examples/IRGCSendDemo/platformio.ini index 5fd807556..e6f6320da 100644 --- a/examples/IRGCSendDemo/platformio.ini +++ b/examples/IRGCSendDemo/platformio.ini @@ -6,7 +6,7 @@ lib_extra_dirs = ../../ lib_ldf_mode = deep+ lib_ignore = examples framework = arduino -build_flags = +build_flags = ; -D_IR_LOCALE_=en-AU [env:nodemcuv2] platform = espressif8266 diff --git a/examples/IRGCTCPServer/platformio.ini b/examples/IRGCTCPServer/platformio.ini index 5fd807556..e6f6320da 100644 --- a/examples/IRGCTCPServer/platformio.ini +++ b/examples/IRGCTCPServer/platformio.ini @@ -6,7 +6,7 @@ lib_extra_dirs = ../../ lib_ldf_mode = deep+ lib_ignore = examples framework = arduino -build_flags = +build_flags = ; -D_IR_LOCALE_=en-AU [env:nodemcuv2] platform = espressif8266 diff --git a/examples/IRMQTTServer/platformio.ini b/examples/IRMQTTServer/platformio.ini index 0a71d5740..1a22b09af 100644 --- a/examples/IRMQTTServer/platformio.ini +++ b/examples/IRMQTTServer/platformio.ini @@ -5,7 +5,7 @@ src_dir = . lib_extra_dirs = ../../ lib_ldf_mode = deep+ lib_ignore = examples -build_flags = -DMQTT_MAX_PACKET_SIZE=768 -D_IR_LOCALE_=en-AU +build_flags = -DMQTT_MAX_PACKET_SIZE=768 ; -D_IR_LOCALE_=en-AU framework = arduino platform = espressif8266 diff --git a/examples/IRServer/platformio.ini b/examples/IRServer/platformio.ini index 5fd807556..e6f6320da 100644 --- a/examples/IRServer/platformio.ini +++ b/examples/IRServer/platformio.ini @@ -6,7 +6,7 @@ lib_extra_dirs = ../../ lib_ldf_mode = deep+ lib_ignore = examples framework = arduino -build_flags = +build_flags = ; -D_IR_LOCALE_=en-AU [env:nodemcuv2] platform = espressif8266 diff --git a/examples/IRrecvDemo/platformio.ini b/examples/IRrecvDemo/platformio.ini index 5fd807556..e6f6320da 100644 --- a/examples/IRrecvDemo/platformio.ini +++ b/examples/IRrecvDemo/platformio.ini @@ -6,7 +6,7 @@ lib_extra_dirs = ../../ lib_ldf_mode = deep+ lib_ignore = examples framework = arduino -build_flags = +build_flags = ; -D_IR_LOCALE_=en-AU [env:nodemcuv2] platform = espressif8266 diff --git a/examples/IRrecvDump/platformio.ini b/examples/IRrecvDump/platformio.ini index 5fd807556..e6f6320da 100644 --- a/examples/IRrecvDump/platformio.ini +++ b/examples/IRrecvDump/platformio.ini @@ -6,7 +6,7 @@ lib_extra_dirs = ../../ lib_ldf_mode = deep+ lib_ignore = examples framework = arduino -build_flags = +build_flags = ; -D_IR_LOCALE_=en-AU [env:nodemcuv2] platform = espressif8266 diff --git a/examples/IRrecvDumpV2/platformio.ini b/examples/IRrecvDumpV2/platformio.ini index 1eb1d8f51..c5b72f2d7 100644 --- a/examples/IRrecvDumpV2/platformio.ini +++ b/examples/IRrecvDumpV2/platformio.ini @@ -10,7 +10,7 @@ framework = arduino lib_extra_dirs = ../../ lib_ldf_mode = deep+ lib_ignore = examples -build_flags = +build_flags = ; -D_IR_LOCALE_=en-AU [env:nodemcuv2] board = nodemcuv2 diff --git a/examples/IRsendDemo/platformio.ini b/examples/IRsendDemo/platformio.ini index 5fd807556..e6f6320da 100644 --- a/examples/IRsendDemo/platformio.ini +++ b/examples/IRsendDemo/platformio.ini @@ -6,7 +6,7 @@ lib_extra_dirs = ../../ lib_ldf_mode = deep+ lib_ignore = examples framework = arduino -build_flags = +build_flags = ; -D_IR_LOCALE_=en-AU [env:nodemcuv2] platform = espressif8266 diff --git a/examples/IRsendProntoDemo/platformio.ini b/examples/IRsendProntoDemo/platformio.ini index 5fd807556..e6f6320da 100644 --- a/examples/IRsendProntoDemo/platformio.ini +++ b/examples/IRsendProntoDemo/platformio.ini @@ -6,7 +6,7 @@ lib_extra_dirs = ../../ lib_ldf_mode = deep+ lib_ignore = examples framework = arduino -build_flags = +build_flags = ; -D_IR_LOCALE_=en-AU [env:nodemcuv2] platform = espressif8266 diff --git a/examples/JVCPanasonicSendDemo/platformio.ini b/examples/JVCPanasonicSendDemo/platformio.ini index 5fd807556..e6f6320da 100644 --- a/examples/JVCPanasonicSendDemo/platformio.ini +++ b/examples/JVCPanasonicSendDemo/platformio.ini @@ -6,7 +6,7 @@ lib_extra_dirs = ../../ lib_ldf_mode = deep+ lib_ignore = examples framework = arduino -build_flags = +build_flags = ; -D_IR_LOCALE_=en-AU [env:nodemcuv2] platform = espressif8266 diff --git a/examples/LGACSend/platformio.ini b/examples/LGACSend/platformio.ini index 5fd807556..e6f6320da 100644 --- a/examples/LGACSend/platformio.ini +++ b/examples/LGACSend/platformio.ini @@ -6,7 +6,7 @@ lib_extra_dirs = ../../ lib_ldf_mode = deep+ lib_ignore = examples framework = arduino -build_flags = +build_flags = ; -D_IR_LOCALE_=en-AU [env:nodemcuv2] platform = espressif8266 diff --git a/examples/SmartIRRepeater/platformio.ini b/examples/SmartIRRepeater/platformio.ini index 5fd807556..e6f6320da 100644 --- a/examples/SmartIRRepeater/platformio.ini +++ b/examples/SmartIRRepeater/platformio.ini @@ -6,7 +6,7 @@ lib_extra_dirs = ../../ lib_ldf_mode = deep+ lib_ignore = examples framework = arduino -build_flags = +build_flags = ; -D_IR_LOCALE_=en-AU [env:nodemcuv2] platform = espressif8266 diff --git a/examples/TurnOnArgoAC/platformio.ini b/examples/TurnOnArgoAC/platformio.ini index 5fd807556..e6f6320da 100644 --- a/examples/TurnOnArgoAC/platformio.ini +++ b/examples/TurnOnArgoAC/platformio.ini @@ -6,7 +6,7 @@ lib_extra_dirs = ../../ lib_ldf_mode = deep+ lib_ignore = examples framework = arduino -build_flags = +build_flags = ; -D_IR_LOCALE_=en-AU [env:nodemcuv2] platform = espressif8266 diff --git a/examples/TurnOnDaikinAC/platformio.ini b/examples/TurnOnDaikinAC/platformio.ini index 5fd807556..e6f6320da 100644 --- a/examples/TurnOnDaikinAC/platformio.ini +++ b/examples/TurnOnDaikinAC/platformio.ini @@ -6,7 +6,7 @@ lib_extra_dirs = ../../ lib_ldf_mode = deep+ lib_ignore = examples framework = arduino -build_flags = +build_flags = ; -D_IR_LOCALE_=en-AU [env:nodemcuv2] platform = espressif8266 diff --git a/examples/TurnOnFujitsuAC/platformio.ini b/examples/TurnOnFujitsuAC/platformio.ini index 2d1f8f327..e6f6320da 100644 --- a/examples/TurnOnFujitsuAC/platformio.ini +++ b/examples/TurnOnFujitsuAC/platformio.ini @@ -6,7 +6,7 @@ lib_extra_dirs = ../../ lib_ldf_mode = deep+ lib_ignore = examples framework = arduino -build_flags = -D_IR_LOCALE_=en-AU +build_flags = ; -D_IR_LOCALE_=en-AU [env:nodemcuv2] platform = espressif8266 diff --git a/examples/TurnOnKelvinatorAC/platformio.ini b/examples/TurnOnKelvinatorAC/platformio.ini index 2d1f8f327..e6f6320da 100644 --- a/examples/TurnOnKelvinatorAC/platformio.ini +++ b/examples/TurnOnKelvinatorAC/platformio.ini @@ -6,7 +6,7 @@ lib_extra_dirs = ../../ lib_ldf_mode = deep+ lib_ignore = examples framework = arduino -build_flags = -D_IR_LOCALE_=en-AU +build_flags = ; -D_IR_LOCALE_=en-AU [env:nodemcuv2] platform = espressif8266 diff --git a/examples/TurnOnMitsubishiAC/platformio.ini b/examples/TurnOnMitsubishiAC/platformio.ini index 2d1f8f327..e6f6320da 100644 --- a/examples/TurnOnMitsubishiAC/platformio.ini +++ b/examples/TurnOnMitsubishiAC/platformio.ini @@ -6,7 +6,7 @@ lib_extra_dirs = ../../ lib_ldf_mode = deep+ lib_ignore = examples framework = arduino -build_flags = -D_IR_LOCALE_=en-AU +build_flags = ; -D_IR_LOCALE_=en-AU [env:nodemcuv2] platform = espressif8266 diff --git a/examples/TurnOnMitsubishiHeavyAc/platformio.ini b/examples/TurnOnMitsubishiHeavyAc/platformio.ini index 2d1f8f327..e6f6320da 100644 --- a/examples/TurnOnMitsubishiHeavyAc/platformio.ini +++ b/examples/TurnOnMitsubishiHeavyAc/platformio.ini @@ -6,7 +6,7 @@ lib_extra_dirs = ../../ lib_ldf_mode = deep+ lib_ignore = examples framework = arduino -build_flags = -D_IR_LOCALE_=en-AU +build_flags = ; -D_IR_LOCALE_=en-AU [env:nodemcuv2] platform = espressif8266 diff --git a/examples/TurnOnPanasonicAC/platformio.ini b/examples/TurnOnPanasonicAC/platformio.ini index 2d1f8f327..e6f6320da 100644 --- a/examples/TurnOnPanasonicAC/platformio.ini +++ b/examples/TurnOnPanasonicAC/platformio.ini @@ -6,7 +6,7 @@ lib_extra_dirs = ../../ lib_ldf_mode = deep+ lib_ignore = examples framework = arduino -build_flags = -D_IR_LOCALE_=en-AU +build_flags = ; -D_IR_LOCALE_=en-AU [env:nodemcuv2] platform = espressif8266 diff --git a/examples/TurnOnToshibaAC/platformio.ini b/examples/TurnOnToshibaAC/platformio.ini index 2d1f8f327..e6f6320da 100644 --- a/examples/TurnOnToshibaAC/platformio.ini +++ b/examples/TurnOnToshibaAC/platformio.ini @@ -6,7 +6,7 @@ lib_extra_dirs = ../../ lib_ldf_mode = deep+ lib_ignore = examples framework = arduino -build_flags = -D_IR_LOCALE_=en-AU +build_flags = ; -D_IR_LOCALE_=en-AU [env:nodemcuv2] platform = espressif8266 diff --git a/examples/TurnOnTrotecAC/platformio.ini b/examples/TurnOnTrotecAC/platformio.ini index 5fd807556..e6f6320da 100644 --- a/examples/TurnOnTrotecAC/platformio.ini +++ b/examples/TurnOnTrotecAC/platformio.ini @@ -6,7 +6,7 @@ lib_extra_dirs = ../../ lib_ldf_mode = deep+ lib_ignore = examples framework = arduino -build_flags = +build_flags = ; -D_IR_LOCALE_=en-AU [env:nodemcuv2] platform = espressif8266 diff --git a/examples/Web-AC-control/platformio.ini b/examples/Web-AC-control/platformio.ini index 86ac8dfe3..731442831 100644 --- a/examples/Web-AC-control/platformio.ini +++ b/examples/Web-AC-control/platformio.ini @@ -6,7 +6,7 @@ lib_extra_dirs = ../../ lib_ldf_mode = deep+ lib_ignore = examples framework = arduino -build_flags = +build_flags = ; -D_IR_LOCALE_=en-AU [common] lib_deps_builtin = diff --git a/platformio.ini b/platformio.ini index fd608fbb6..67dbeb606 100644 --- a/platformio.ini +++ b/platformio.ini @@ -8,7 +8,7 @@ lib_ldf_mode = deep+ lib_ignore = examples framework = arduino platform = espressif8266 -build_flags = -D_IR_LOCALE_=en-AU +build_flags = ; -D_IR_LOCALE_=en-AU [env:nodemcuv2] board = nodemcuv2 From 78eb8fc62092f49a6059705bbe95fa50876a6a66 Mon Sep 17 00:00:00 2001 From: David Date: Tue, 8 Oct 2019 12:30:55 +1000 Subject: [PATCH 3/5] Add names to the sub-jobs in Travis. --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 7f5ebc0c4..bd9a0badd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,7 @@ notifications: on_failure: change jobs: include: + - stage: "Compile library and examples" - script: # Check that everything compiles but some heavy tasks e.g. IRMQTTServer & IRrecvDumpV2 # i.e. We are splitting the work load in to parallel tasks. @@ -27,6 +28,7 @@ jobs: # Check that everything else compiles. # i.e. We are splitting the work load in to parallel tasks. - find . -regextype egrep -name platformio.ini -type f -regex ".*IR(MQTTServer|recvDumpV2).*" | sed 's,/platformio.ini$,,' | xargs -n 1 pio run --project-dir + - stage: "Unit tests & Linter checks" - script: # Run all the Tests & check the code linters have no issues. # i.e. We are splitting the work load in to parallel tasks. From 9677230e2a695cb6aef91dd0576b0b42d7ea7440 Mon Sep 17 00:00:00 2001 From: David Date: Tue, 8 Oct 2019 12:34:48 +1000 Subject: [PATCH 4/5] Fix stage names. --- .travis.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index bd9a0badd..abdfda0f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,17 +19,18 @@ notifications: on_failure: change jobs: include: - - stage: "Compile library and examples" - - script: + - stage: "Compile the trivial examples" + script: # Check that everything compiles but some heavy tasks e.g. IRMQTTServer & IRrecvDumpV2 # i.e. We are splitting the work load in to parallel tasks. - find . -regextype egrep -name platformio.ini -type f \! -regex ".*IR(MQTTServer|recvDumpV2).*" | sed 's,/platformio.ini$,,' | xargs -n 1 pio run --project-dir - - script: + - stage: "Compile the complex examples" + script: # Check that everything else compiles. # i.e. We are splitting the work load in to parallel tasks. - find . -regextype egrep -name platformio.ini -type f -regex ".*IR(MQTTServer|recvDumpV2).*" | sed 's,/platformio.ini$,,' | xargs -n 1 pio run --project-dir - stage: "Unit tests & Linter checks" - - script: + script: # Run all the Tests & check the code linters have no issues. # i.e. We are splitting the work load in to parallel tasks. # Check the version numbers match. From 012342513b94a57db66211c1ca10993271e9e169 Mon Sep 17 00:00:00 2001 From: David Date: Tue, 8 Oct 2019 12:50:14 +1000 Subject: [PATCH 5/5] Use name: instead of stage: --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index abdfda0f8..0193c4dc3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,17 +19,17 @@ notifications: on_failure: change jobs: include: - - stage: "Compile the trivial examples" + - name: "Compile the trivial examples" script: # Check that everything compiles but some heavy tasks e.g. IRMQTTServer & IRrecvDumpV2 # i.e. We are splitting the work load in to parallel tasks. - find . -regextype egrep -name platformio.ini -type f \! -regex ".*IR(MQTTServer|recvDumpV2).*" | sed 's,/platformio.ini$,,' | xargs -n 1 pio run --project-dir - - stage: "Compile the complex examples" + - name: "Compile the complex examples" script: # Check that everything else compiles. # i.e. We are splitting the work load in to parallel tasks. - find . -regextype egrep -name platformio.ini -type f -regex ".*IR(MQTTServer|recvDumpV2).*" | sed 's,/platformio.ini$,,' | xargs -n 1 pio run --project-dir - - stage: "Unit tests & Linter checks" + - name: "Unit tests & Linter checks" script: # Run all the Tests & check the code linters have no issues. # i.e. We are splitting the work load in to parallel tasks.