From 85da1ac671dde1110a94feea22885381d05e1f98 Mon Sep 17 00:00:00 2001 From: Saleem Rashid Date: Mon, 9 Oct 2017 18:12:46 +0100 Subject: [PATCH] travis.yml: Download protoc from GitHub --- .travis.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8fc80d9..1b354cf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,26 +8,29 @@ addons: - build-essential - gcc-arm-none-eabi - libnewlib-arm-none-eabi - - protobuf-compiler - - libprotobuf-dev - - python-protobuf env: global: - MAKEFLAGS=-j2 + - PROTOBUF_VERSION=3.4.0 matrix: - DEBUG_LINK=0 FASTFLASH=0 - DEBUG_LINK=1 FASTFLASH=0 - DEBUG_LINK=0 FASTFLASH=1 - DEBUG_LINK=1 FASTFLASH=1 +install: + - curl -LO "https://github.com/google/protobuf/releases/download/v${PROTOBUF_VERSION}/protoc-${PROTOBUF_VERSION}-linux-x86_64.zip" + - unzip "protoc-${PROTOBUF_VERSION}-linux-x86_64.zip" -d protoc + - export PATH="$(pwd)/protoc/bin:$PATH" + - pip2 install --user "protobuf==${PROTOBUF_VERSION}" + script: - make -C vendor/libopencm3 lib/stm32/f2 - make -C vendor/nanopb/generator/proto - make - make -C bootloader - make -C fastflash - - sed -i '/, deprecated = true/d' firmware/protob/messages.proto # protobuf 2.5 compatibility :-/ - make -C firmware/protob - make -C firmware - make -C demo