Merge pull request #1019 from keyboardio/f/arduino-cli-update

Fixes for arduino cli blowing up on a missing json file
pull/1021/head
Jesse Vincent 4 years ago committed by GitHub
commit abbe6370d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -33,7 +33,7 @@ $(ARDUINO_DIRECTORIES_USER)/hardware/keyboardio/avr/boards.txt:
rm -d $(ARDUINO_DIRECTORIES_USER)/hardware/keyboardio/avr/libraries/Kaleidoscope
ln -s $(KALEIDOSCOPE_DIR) $(ARDUINO_DIRECTORIES_USER)/hardware/keyboardio/avr/libraries/Kaleidoscope
simulator-tests: configure-arduino-cli $(ARDUINO_DIRECTORIES_USER)/hardware/keyboardio/virtual/boards.txt
simulator-tests: setup
$(MAKE) -C tests all
docker-simulator-tests:

@ -3,7 +3,7 @@ LABEL maintainer="Keyboard.io, inc"
RUN apt-get -qq update && \
DEBIAN_FRONTEND=noninteractive \
apt-get -qq install -y xz-utils curl make build-essential libxtst-dev cmake ccache vim
apt-get -qq install -y xz-utils curl make build-essential libxtst-dev cmake ccache vim git
RUN ccache --set-config=cache_dir=/kaleidoscope-persist/ccache/cache

@ -146,9 +146,14 @@ configure-arduino-cli: $(ARDUINO_DIRECTORIES_DATA)/arduino-cli.yaml
$(ARDUINO_DIRECTORIES_DATA)/arduino-cli.yaml:
$(QUIET) $(ARDUINO_CLI) config init
install-arduino-core-kaleidoscope:
arduino-update-cores:
$(QUIET) $(ARDUINO_CLI) core update-index
install-arduino-core-kaleidoscope: arduino-update-cores
$(QUIET) $(ARDUINO_CLI) core install "keyboardio:avr"
install-arduino-core-avr:
install-arduino-core-avr: arduino-update-cores
$(QUIET) $(ARDUINO_CLI) core install "arduino:avr"

Loading…
Cancel
Save