From 106c05a49bc44193f685ba355bd09264a6c675ff Mon Sep 17 00:00:00 2001 From: Rob Giseburt Date: Thu, 23 Feb 2017 10:43:13 -0600 Subject: [PATCH 1/2] Working on #245 - Getting Travis working again (#246) Making Travis work again (32bit linux binary issue) --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4b2d8a86..bacdcc8f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,10 @@ language: c before_install: -- sudo apt-get update -q + - sudo apt-get update -q install: -- sudo apt-get install -qq lib32z1 + - sudo apt-get install lib32z1 lib32ncurses5 lib32bz2-1.0 script: - cd ${TRAVIS_BUILD_DIR}/g2core From 8df3aeada66345b78315ec3986c3c5754bdffb06 Mon Sep 17 00:00:00 2001 From: Rob Giseburt Date: Thu, 23 Feb 2017 10:50:11 -0600 Subject: [PATCH 2/2] 100.21 // Merged dev-209b-random-pauses to compelte USB changes (only fix travis-ci from 100.20) --- g2core/g2core_info.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/g2core/g2core_info.h b/g2core/g2core_info.h index becf7742..2f1a6a70 100644 --- a/g2core/g2core_info.h +++ b/g2core/g2core_info.h @@ -21,7 +21,7 @@ #ifndef G2CORE_INFO_H_ONCE #define G2CORE_INFO_H_ONCE -#define G2CORE_FIRMWARE_BUILD 100.20 // Merged dev-209b-random-pauses to compelte USB changes +#define G2CORE_FIRMWARE_BUILD 100.21 // Merged dev-209b-random-pauses to compelte USB changes (only fix travis-ci from 100.20) #ifdef GIT_VERSION #define G2CORE_FIRMWARE_BUILD_STRING GIT_VERSION #else