do less work to install a duplicate arduino cli when running docker-simulator-tests.

tmp/arduino-cli-pre-rebase
Jesse Vincent 4 years ago
parent 36af0f3023
commit 93800058ac
No known key found for this signature in database
GPG Key ID: CC228463465E40BC

@ -94,7 +94,7 @@ prepare-virtual:
$(MAKE) -C $(BOARD_HARDWARE_PATH)/keyboardio prepare-virtual $(MAKE) -C $(BOARD_HARDWARE_PATH)/keyboardio prepare-virtual
simulator-tests: install-arduino-cli configure-arduino-cli install-arduino-core-avr prepare-virtual simulator-tests: configure-arduino-cli prepare-virtual
$(MAKE) -C tests all $(MAKE) -C tests all
docker-simulator-tests: docker-simulator-tests:

@ -8,15 +8,9 @@ RUN apt-get -qq update && \
RUN ccache --set-config=cache_dir=/kaleidoscope-persist/ccache/cache RUN ccache --set-config=cache_dir=/kaleidoscope-persist/ccache/cache
ENV ARDUINO_VERSION "1.8.13"
WORKDIR /usr/local
RUN curl https://downloads.arduino.cc/arduino-${ARDUINO_VERSION}-linux64.tar.xz | \
xzcat | tar xf - && \
ln -s arduino-${ARDUINO_VERSION} arduino
RUN curl -fsSL https://raw.githubusercontent.com/arduino/arduino-cli/master/install.sh | \ RUN curl -fsSL https://raw.githubusercontent.com/arduino/arduino-cli/master/install.sh | \
sh sh
RUN /usr/local/bin/arduino-cli core install arduino:avr RUN /bin/arduino-cli core install arduino:avr
COPY docker-entrypoint.sh /usr/local/bin/entrypoint COPY docker-entrypoint.sh /usr/local/bin/entrypoint

Loading…
Cancel
Save