From b8d5c3a2032a8c3ea05230e3b2586ff1d7d39b6c Mon Sep 17 00:00:00 2001 From: Gergely Nagy Date: Tue, 28 Jan 2020 20:56:59 +0100 Subject: [PATCH 1/2] travis: Make sure we use the current Kaleidoscope As it turns out, simply removing the `library.properties` from the Bundle's Kaleidoscope is not enough to discard it completely. So instead, to make sure we're using the right version of it, remove the copy from the bundle, and symlink ourselves back in. Signed-off-by: Gergely Nagy --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0dad7225..8d6e09c4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,9 +9,10 @@ addons: - shellcheck install: - git clone --depth 1 --recurse-submodules https://github.com/keyboardio/Kaleidoscope-Bundle-Keyboardio hardware/keyboardio -## We delete the library.properties of the Bundle's Kaleidoscope. -## We do this to force Arduino to use the current one instead of the bundled version. - - rm -f hardware/keyboardio/avr/libraries/Kaleidoscope/library.properties +## We delete the Bundle's version of Kaleidoscope, and symlink ourselves in. +## This makes sure we're using the current version of the library. + - rm -rf hardware/keyboardio/avr/libraries/Kaleidoscope + - ln -s $(pwd) hardware/keyboardio/avr/libraries/Kaleidoscope script: - make travis-test KALEIDOSCOPE_TEMP_PATH=$(pwd)/.kaleidoscope-build-cache BOARD_HARDWARE_PATH=$(pwd)/hardware notifications: From 5cd6d363d467db79430f2b9c635618a19a2ce863 Mon Sep 17 00:00:00 2001 From: Gergely Nagy Date: Tue, 11 Feb 2020 12:32:59 +0100 Subject: [PATCH 2/2] travis: Move the hardware dir one level up Signed-off-by: Gergely Nagy --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8d6e09c4..28f0564c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,13 +8,13 @@ addons: packages: - shellcheck install: - - git clone --depth 1 --recurse-submodules https://github.com/keyboardio/Kaleidoscope-Bundle-Keyboardio hardware/keyboardio + - git clone --depth 1 --recurse-submodules https://github.com/keyboardio/Kaleidoscope-Bundle-Keyboardio ../hardware/keyboardio ## We delete the Bundle's version of Kaleidoscope, and symlink ourselves in. ## This makes sure we're using the current version of the library. - - rm -rf hardware/keyboardio/avr/libraries/Kaleidoscope - - ln -s $(pwd) hardware/keyboardio/avr/libraries/Kaleidoscope + - rm -rf ../hardware/keyboardio/avr/libraries/Kaleidoscope + - ln -s $(pwd) ../hardware/keyboardio/avr/libraries/Kaleidoscope script: - - make travis-test KALEIDOSCOPE_TEMP_PATH=$(pwd)/.kaleidoscope-build-cache BOARD_HARDWARE_PATH=$(pwd)/hardware + - make travis-test KALEIDOSCOPE_TEMP_PATH=$(pwd)/.kaleidoscope-build-cache BOARD_HARDWARE_PATH=$(pwd)/../hardware notifications: email: on_success: change