travis: Update to run the new googletest-based suite aswell

We do a number of things here:

- Bump the distro version from Trusty to Bionic, because we need newer tools.
- Install cmake.
- Unset CC, because it interferes with our virtual builds.
- Run the googletest-based suite before building the examples

Signed-off-by: Gergely Nagy <algernon@keyboard.io>
pull/908/head
Gergely Nagy 4 years ago
parent fad1b7e051
commit b036d7da51
No known key found for this signature in database
GPG Key ID: AC1E90BAC433F68F

@ -1,4 +1,4 @@
dist: trusty dist: bionic
sudo: false sudo: false
language: c language: c
os: os:
@ -7,6 +7,7 @@ addons:
apt: apt:
packages: packages:
- shellcheck - shellcheck
- cmake
install: 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. ## We delete the Bundle's version of Kaleidoscope, and symlink ourselves in.
@ -14,6 +15,11 @@ install:
- rm -rf ../hardware/keyboardio/avr/libraries/Kaleidoscope - rm -rf ../hardware/keyboardio/avr/libraries/Kaleidoscope
- ln -s $(pwd) ../hardware/keyboardio/avr/libraries/Kaleidoscope - ln -s $(pwd) ../hardware/keyboardio/avr/libraries/Kaleidoscope
script: script:
- unset CC
- make travis-install-arduino BOARD_HARDWARE_PATH=$(pwd)/../hardware
- (cd ../hardware/keyboardio && make prepare-virtual)
- make -C tests all BOARD_HARDWARE_PATH=$(pwd)/../hardware ARDUINO_PATH="$(pwd)/arduino-1.8.13"
- rm -rf .kaleidoscope-build-cache
- 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: notifications:
email: email:

@ -28,6 +28,7 @@ ${OBJ_DIR}/%.o: ${top_dir}/testing/%.cpp ${H_FILES}
@echo "compile $@" @echo "compile $@"
@install -d "${OBJ_DIR}" @install -d "${OBJ_DIR}"
g++ -o "$@" -c \ g++ -o "$@" -c \
-std=c++14 \
-I${top_dir} \ -I${top_dir} \
-I${top_dir}/src \ -I${top_dir}/src \
-I${bundle_path}/../../virtual/cores/arduino \ -I${bundle_path}/../../virtual/cores/arduino \

@ -55,6 +55,7 @@ ${OBJ_DIR}/%.o: ${SRC_DIR}/%.cpp
@echo "compile $@" @echo "compile $@"
install -d "${OBJ_DIR}" install -d "${OBJ_DIR}"
g++ -o "$@" -c \ g++ -o "$@" -c \
-std=c++14 \
-I${top_dir} \ -I${top_dir} \
-I${top_dir}/src \ -I${top_dir}/src \
-I${bundle_path}/../../virtual/cores/arduino \ -I${bundle_path}/../../virtual/cores/arduino \

Loading…
Cancel
Save