From 774a7576a22a70b962d566b72462ef5af50f7cf8 Mon Sep 17 00:00:00 2001 From: Thibaut VIARD Date: Tue, 20 Oct 2015 19:18:33 +0200 Subject: [PATCH 1/8] [build] going to travis containers --- .travis.yml | 21 +++++++++++++++++---- Makefile | 2 +- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 317899b..1fab100 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,17 +2,30 @@ language: c compiler: gcc -before_install: - - sudo add-apt-repository -y ppa:terry.guo/gcc-arm-embedded +# use containers +sudo: false + +# +#before_install: +# - sudo add-apt-repository -y ppa:terry.guo/gcc-arm-embedded install: - - sudo apt-get update - - sudo apt-get install -y gcc-arm-none-eabi + - wget https://launchpad.net/gcc-arm-embedded/4.9/4.9-2015-q3-update/+download/gcc-arm-none-eabi-4_9-2015q3-20150921-linux.tar.bz2 + - tar -xf gcc-arm-none-eabi-4_9-2015q3-20150921-linux.tar.bz2 + +addons: + apt_packages: + - lib32bz2-1.0 + - lib32ncurses5 + - lib32z1 + - cppcheck script: - make env: + PATH=/home/travis/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/home/travis/gcc-arm-none-eabi-4_9-2015q3/bin + matrix: - VARIANT_NAME=arduino_due - VARIANT_NAME=atmel_sam4s_xplained diff --git a/Makefile b/Makefile index b565c5b..9efcbb8 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,6 @@ endif CORE_VERSION := $(shell grep version= $(ROOT_PATH)/module/platform.txt | sed 's/version=//g') PACKAGE_NAME := $(basename $(notdir $(ROOT_PATH))) FOLDER2ARCHIVE := module -#../$(basename $(notdir $(ROOT_PATH))) # specify default variant, if not provided VARIANT_NAME ?= atmel_sam4s_xplained @@ -42,6 +41,7 @@ print_info: print_info_travis: @echo ---------------------------------------------------------- @echo Travis-CI envvars + @echo PATH = $(PATH) @echo TRAVIS_OS_NAME = $(TRAVIS_OS_NAME) @echo TRAVIS_LANGUAGE = $(TRAVIS_LANGUAGE) @echo TRAVIS_REPO_SLUG = $(TRAVIS_REPO_SLUG) From 3323914b5c15bf6bc797f72a8f38ad1f7e07e5a7 Mon Sep 17 00:00:00 2001 From: Thibaut VIARD Date: Tue, 20 Oct 2015 19:28:39 +0200 Subject: [PATCH 2/8] [build] fixing travis script --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1fab100..405d15e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,8 @@ script: - make env: - PATH=/home/travis/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/home/travis/gcc-arm-none-eabi-4_9-2015q3/bin + global: + - PATH=/home/travis/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/home/travis/gcc-arm-none-eabi-4_9-2015q3/bin matrix: - VARIANT_NAME=arduino_due From 7d5e2e997941b6e22dc6e954640bbe2c299df764 Mon Sep 17 00:00:00 2001 From: Thibaut VIARD Date: Tue, 20 Oct 2015 19:32:50 +0200 Subject: [PATCH 3/8] [build] fixing travis script --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 405d15e..2071400 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ sudo: false install: - wget https://launchpad.net/gcc-arm-embedded/4.9/4.9-2015-q3-update/+download/gcc-arm-none-eabi-4_9-2015q3-20150921-linux.tar.bz2 - - tar -xf gcc-arm-none-eabi-4_9-2015q3-20150921-linux.tar.bz2 + - tar -xvf gcc-arm-none-eabi-4_9-2015q3-20150921-linux.tar.bz2 .. addons: apt_packages: From bc3e7061578fb0ea8e77bcb65134f1c73f6921fc Mon Sep 17 00:00:00 2001 From: Thibaut VIARD Date: Tue, 20 Oct 2015 19:49:13 +0200 Subject: [PATCH 4/8] [build] fixing toolchain archive extraction --- .travis.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2071400..7329866 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,8 +10,10 @@ sudo: false # - sudo add-apt-repository -y ppa:terry.guo/gcc-arm-embedded install: - - wget https://launchpad.net/gcc-arm-embedded/4.9/4.9-2015-q3-update/+download/gcc-arm-none-eabi-4_9-2015q3-20150921-linux.tar.bz2 - - tar -xvf gcc-arm-none-eabi-4_9-2015q3-20150921-linux.tar.bz2 .. + - wget --output-document=extras/toolchain.tar.bz2 https://launchpad.net/gcc-arm-embedded/4.9/4.9-2015-q3-update/+download/gcc-arm-none-eabi-4_9-2015q3-20150921-linux.tar.bz2 + - cd extras + - tar -xvf extras/toolchain.tar.bz2 + - cd .. addons: apt_packages: @@ -25,7 +27,7 @@ script: env: global: - - PATH=/home/travis/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/home/travis/gcc-arm-none-eabi-4_9-2015q3/bin + - PATH=/home/travis/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:"$(TRAVIS_BUILD_DIR)/extras/gcc-arm-none-eabi-4_9-2015q3/bin" matrix: - VARIANT_NAME=arduino_due From 2fb38cdecc5568586bdaf53fbeeedc4bc2188d28 Mon Sep 17 00:00:00 2001 From: Thibaut VIARD Date: Tue, 20 Oct 2015 19:52:13 +0200 Subject: [PATCH 5/8] [build] fixing wrong archive path --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7329866..08e37f4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ sudo: false install: - wget --output-document=extras/toolchain.tar.bz2 https://launchpad.net/gcc-arm-embedded/4.9/4.9-2015-q3-update/+download/gcc-arm-none-eabi-4_9-2015q3-20150921-linux.tar.bz2 - cd extras - - tar -xvf extras/toolchain.tar.bz2 + - tar -xvf toolchain.tar.bz2 - cd .. addons: From 28b98446c9dc55c180b8022c36fdf755c0c7287c Mon Sep 17 00:00:00 2001 From: Thibaut VIARD Date: Tue, 20 Oct 2015 19:56:16 +0200 Subject: [PATCH 6/8] [build] trying to fix PATH --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 08e37f4..8db463f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ script: env: global: - - PATH=/home/travis/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:"$(TRAVIS_BUILD_DIR)/extras/gcc-arm-none-eabi-4_9-2015q3/bin" + - PATH=/home/travis/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$(TRAVIS_BUILD_DIR)/extras/gcc-arm-none-eabi-4_9-2015q3/bin matrix: - VARIANT_NAME=arduino_due From b3939e9b6eaaacfe329d9799761a3d2226cbbe94 Mon Sep 17 00:00:00 2001 From: Thibaut VIARD Date: Tue, 20 Oct 2015 20:02:43 +0200 Subject: [PATCH 7/8] [build] trying to fix PATH 2/n --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8db463f..1bf27ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ script: env: global: - - PATH=/home/travis/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$(TRAVIS_BUILD_DIR)/extras/gcc-arm-none-eabi-4_9-2015q3/bin + - PATH=/home/travis/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$TRAVIS_BUILD_DIR/extras/gcc-arm-none-eabi-4_9-2015q3/bin matrix: - VARIANT_NAME=arduino_due From 22c5e0b1b2e8e53d3d7695f1c2bfd358c45bcaa8 Mon Sep 17 00:00:00 2001 From: Thibaut VIARD Date: Tue, 20 Oct 2015 20:08:33 +0200 Subject: [PATCH 8/8] [build] travis script cleanup --- .travis.yml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1bf27ca..41580fc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,14 +5,10 @@ compiler: gcc # use containers sudo: false -# -#before_install: -# - sudo add-apt-repository -y ppa:terry.guo/gcc-arm-embedded - install: - wget --output-document=extras/toolchain.tar.bz2 https://launchpad.net/gcc-arm-embedded/4.9/4.9-2015-q3-update/+download/gcc-arm-none-eabi-4_9-2015q3-20150921-linux.tar.bz2 - cd extras - - tar -xvf toolchain.tar.bz2 + - tar -xf toolchain.tar.bz2 - cd .. addons: @@ -39,13 +35,6 @@ env: - VARIANT_NAME=logos_arachnio_due - VARIANT_NAME=poppy_core -#addons: -# apt: -# sources: -# - gcc-arm-embedded -# packages: -# - gcc-arm-none-eabi - #deploy: # provider: releases # user: "GITHUB USERNAME"