diff mbox

travis: switch to ubuntu trusty

Message ID 20170210150935.24733-1-maxim.uvarov@linaro.org
State Accepted
Commit 9420b7953a05f2759524234a26e7e2a774a23769
Headers show

Commit Message

Maxim Uvarov Feb. 10, 2017, 3:09 p.m. UTC
ubuntu trusty has updated doxygen 1.8.4 which match your requirements
and do not generate any warnings. Also no need to compile cunit anymore
we can take it from packages. Compiler version stays the same 4.8 for gcc.

Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>

---
 .travis.yml | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

-- 
2.11.0.295.gd7dffce

Comments

Mike Holmes Feb. 10, 2017, 3:26 p.m. UTC | #1
On 10 February 2017 at 10:09, Maxim Uvarov <maxim.uvarov@linaro.org> wrote:

> ubuntu trusty



I can't see why not use trusty, it is LTS, but this implies that trusty is
the tested distro for ODP patch acceptance. Do we need to update
CONTRIBUTING to say that this version does define the pass criteria for
package versions with respects to warnings and errors generated by make
check etc?



> has updated doxygen 1.8.4 which match your requirements

>


who's requirements, we need to be specific in the git log


> and do



does


>  not generate any warnings. Also no need to compile cunit anymore

> we can take it from packages. Compiler version stays the same 4.8 for gcc.

>

> Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>

> ---

>  .travis.yml | 21 +++++----------------

>  1 file changed, 5 insertions(+), 16 deletions(-)

>

> diff --git a/.travis.yml b/.travis.yml

> index 9544ec8f..90602b64 100644

> --- a/.travis.yml

> +++ b/.travis.yml

> @@ -9,6 +9,7 @@

>

>  language: c

>  sudo: required

> +dist: trusty

>  env:

>    global:

>      # COVERITY_SCAN_TOKEN

> @@ -34,13 +35,13 @@ env:

>

>  matrix:

>    include:

> -    - compiler: gcc-4.8

> +    - compiler: gcc

>        addons:

>          apt:

>            sources:

>              - ubuntu-toolchain-r-test

>            packages:

> -            - gcc-4.8

> +            - gcc

>        env: MY_CF="-O0 -coverage" MY_LDF="--coverage" DOCOV=1

>      - compiler: clang

>        addons:

> @@ -55,23 +56,11 @@ before_install:

>

>          - sudo apt-get -qq update

>          - sudo apt-get install automake autoconf libtool libssl-dev

> graphviz mscgen doxygen

> -        - sudo apt-get install libpcap-dev linux-headers-`uname -r`

> +        - sudo apt-get install libpcap-dev linux-headers-`uname -r`

> libcunit1-dev

>          - sudo pip install coverage

>          - gem install asciidoctor

>          - PATH=${PATH//:\.\/node_modules\/\.bin/}

>

> -#       Install cunit for the validation tests because distro version is

> too old and fails C99 compile

> -        - export CUNIT_VERSION=2.1-3

> -        - curl -sSOL http://sourceforge.net/projects/cunit/files/CUnit/${

> CUNIT_VERSION}/CUnit-${CUNIT_VERSION}.tar.bz2

> -        - tar -jxf *.bz2

> -        - cd CUnit*

> -        - ./bootstrap

> -        - ./configure --enable-debug --enable-automated --enable-basic

> --enable-console --enable-examples --enable-test

> -        - make

> -        - sudo make install

> -        - cd ..

> -        - export LD_LIBRARY_PATH="/usr/local/lib:$LD_LIBRARY_PATH"

> -

>  #      DPDK pktio

>          - TARGET=${TARGET:-"x86_64-native-linuxapp-gcc"}

>          - git -c advice.detachedHead=false clone -q --depth=1

> --single-branch --branch=v16.07 http://dpdk.org/git/dpdk dpdk

> @@ -124,7 +113,7 @@ script:

>          - sudo rm -rf $KSRC

>

>  after_success:

> -  - if [ -n "$DOCOV" ]; then find . -type f -iname '*.[ch]' -not -path

> ".git/*" -execdir gcov-4.8 {} \; ; bash <(curl -s https://codecov.io/bash)

> -X coveragepy; fi

> +  - if [ -n "$DOCOV" ]; then find . -type f -iname '*.[ch]' -not -path

> ".git/*" -execdir gcov {} \; ; bash <(curl -s https://codecov.io/bash) -X

> coveragepy; fi

>

>  addons:

>      coverity_scan:

> --

> 2.11.0.295.gd7dffce

>

>



-- 
Mike Holmes
Program Manager - Linaro Networking Group
Linaro.org <http://www.linaro.org/> *│ *Open source software for ARM SoCs
"Work should be fun and collaborative, the rest follows"
Maxim Uvarov Feb. 10, 2017, 3:45 p.m. UTC | #2
On 02/10/17 18:26, Mike Holmes wrote:
> 

> 

> On 10 February 2017 at 10:09, Maxim Uvarov <maxim.uvarov@linaro.org

> <mailto:maxim.uvarov@linaro.org>> wrote:

> 

>     ubuntu trusty

> 

> 

> I can't see why not use trusty, it is LTS, but this implies that trusty

> is the tested distro for ODP patch acceptance. Do we need to update

> CONTRIBUTING to say that this version does define the pass criteria for

> package versions with respects to warnings and errors generated by make

> check etc?

> 

>  

> 

>     has updated doxygen 1.8.4 which match your requirements

> 

> 

> who's requirements, we need to be specific in the git log

>


simple requirement is to build everything with no errors. Current travis
is uses ubuntu 12 with doxygen 1.7. That old doxygen does not understand
syntax and fails on it. I do not see any more fresh build in travis so I
just updated it to what is available.

CONTRIBUTING file I think we need review and update. Some time passed
when we wrote it.

Maxim.

> 

>     and do 

> 

> 

> does

>  

> 

>      not generate any warnings. Also no need to compile cunit anymore

>     we can take it from packages. Compiler version stays the same 4.8

>     for gcc.

> 

>     Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org

>     <mailto:maxim.uvarov@linaro.org>>

>     ---

>      .travis.yml | 21 +++++----------------

>      1 file changed, 5 insertions(+), 16 deletions(-)

> 

>     diff --git a/.travis.yml b/.travis.yml

>     index 9544ec8f..90602b64 100644

>     --- a/.travis.yml

>     +++ b/.travis.yml

>     @@ -9,6 +9,7 @@

> 

>      language: c

>      sudo: required

>     +dist: trusty

>      env:

>        global:

>          # COVERITY_SCAN_TOKEN

>     @@ -34,13 +35,13 @@ env:

> 

>      matrix:

>        include:

>     -    - compiler: gcc-4.8

>     +    - compiler: gcc

>            addons:

>              apt:

>                sources:

>                  - ubuntu-toolchain-r-test

>                packages:

>     -            - gcc-4.8

>     +            - gcc

>            env: MY_CF="-O0 -coverage" MY_LDF="--coverage" DOCOV=1

>          - compiler: clang

>            addons:

>     @@ -55,23 +56,11 @@ before_install:

> 

>              - sudo apt-get -qq update

>              - sudo apt-get install automake autoconf libtool libssl-dev

>     graphviz mscgen doxygen

>     -        - sudo apt-get install libpcap-dev linux-headers-`uname -r`

>     +        - sudo apt-get install libpcap-dev linux-headers-`uname -r`

>     libcunit1-dev

>              - sudo pip install coverage

>              - gem install asciidoctor

>              - PATH=${PATH//:\.\/node_modules\/\.bin/}

> 

>     -#       Install cunit for the validation tests because distro

>     version is too old and fails C99 compile

>     -        - export CUNIT_VERSION=2.1-3

>     -        - curl -sSOL

>     http://sourceforge.net/projects/cunit/files/CUnit/${CUNIT_VERSION}/CUnit-${CUNIT_VERSION}.tar.bz2

>     <http://sourceforge.net/projects/cunit/files/CUnit/${CUNIT_VERSION}/CUnit-${CUNIT_VERSION}.tar.bz2>

>     -        - tar -jxf *.bz2

>     -        - cd CUnit*

>     -        - ./bootstrap

>     -        - ./configure --enable-debug --enable-automated

>     --enable-basic --enable-console --enable-examples --enable-test

>     -        - make

>     -        - sudo make install

>     -        - cd ..

>     -        - export LD_LIBRARY_PATH="/usr/local/lib:$LD_LIBRARY_PATH"

>     -

>      #      DPDK pktio

>              - TARGET=${TARGET:-"x86_64-native-linuxapp-gcc"}

>              - git -c advice.detachedHead=false clone -q --depth=1

>     --single-branch --branch=v16.07 http://dpdk.org/git/dpdk dpdk

>     @@ -124,7 +113,7 @@ script:

>              - sudo rm -rf $KSRC

> 

>      after_success:

>     -  - if [ -n "$DOCOV" ]; then find . -type f -iname '*.[ch]' -not

>     -path ".git/*" -execdir gcov-4.8 {} \; ; bash <(curl -s

>     https://codecov.io/bash) -X coveragepy; fi

>     +  - if [ -n "$DOCOV" ]; then find . -type f -iname '*.[ch]' -not

>     -path ".git/*" -execdir gcov {} \; ; bash <(curl -s

>     https://codecov.io/bash) -X coveragepy; fi

> 

>      addons:

>          coverity_scan:

>     --

>     2.11.0.295.gd7dffce

> 

> 

> 

> 

> -- 

> Mike Holmes

> Program Manager - Linaro Networking Group

> Linaro.org <http://www.linaro.org/>* **│ *Open source software for ARM SoCs

> "Work should be fun and collaborative, the rest follows"

> 

> __

> 

>
Mike Holmes Feb. 10, 2017, 3:49 p.m. UTC | #3
patch does work for me
https://travis-ci.org/mike-holmes-linaro/odp/builds/200378657

On 10 February 2017 at 10:45, Maxim Uvarov <maxim.uvarov@linaro.org> wrote:

> On 02/10/17 18:26, Mike Holmes wrote:

> >

> >

> > On 10 February 2017 at 10:09, Maxim Uvarov <maxim.uvarov@linaro.org

> > <mailto:maxim.uvarov@linaro.org>> wrote:

> >

> >     ubuntu trusty

> >

> >

> > I can't see why not use trusty, it is LTS, but this implies that trusty

> > is the tested distro for ODP patch acceptance. Do we need to update

> > CONTRIBUTING to say that this version does define the pass criteria for

> > package versions with respects to warnings and errors generated by make

> > check etc?

> >

> >

> >

> >     has updated doxygen 1.8.4 which match your requirements

> >

> >

> > who's requirements, we need to be specific in the git log

> >

>

> simple requirement is to build everything with no errors. Current travis

> is uses ubuntu 12 with doxygen 1.7. That old doxygen does not understand

> syntax and fails on it. I do not see any more fresh build in travis so I

> just updated it to what is available.

>

> CONTRIBUTING file I think we need review and update. Some time passed

> when we wrote it.

>

> Maxim.

>

> >

> >     and do

> >

> >

> > does

> >

> >

> >      not generate any warnings. Also no need to compile cunit anymore

> >     we can take it from packages. Compiler version stays the same 4.8

> >     for gcc.

> >

> >     Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org

> >     <mailto:maxim.uvarov@linaro.org>>

> >     ---

> >      .travis.yml | 21 +++++----------------

> >      1 file changed, 5 insertions(+), 16 deletions(-)

> >

> >     diff --git a/.travis.yml b/.travis.yml

> >     index 9544ec8f..90602b64 100644

> >     --- a/.travis.yml

> >     +++ b/.travis.yml

> >     @@ -9,6 +9,7 @@

> >

> >      language: c

> >      sudo: required

> >     +dist: trusty

> >      env:

> >        global:

> >          # COVERITY_SCAN_TOKEN

> >     @@ -34,13 +35,13 @@ env:

> >

> >      matrix:

> >        include:

> >     -    - compiler: gcc-4.8

> >     +    - compiler: gcc

> >            addons:

> >              apt:

> >                sources:

> >                  - ubuntu-toolchain-r-test

> >                packages:

> >     -            - gcc-4.8

> >     +            - gcc

> >            env: MY_CF="-O0 -coverage" MY_LDF="--coverage" DOCOV=1

> >          - compiler: clang

> >            addons:

> >     @@ -55,23 +56,11 @@ before_install:

> >

> >              - sudo apt-get -qq update

> >              - sudo apt-get install automake autoconf libtool libssl-dev

> >     graphviz mscgen doxygen

> >     -        - sudo apt-get install libpcap-dev linux-headers-`uname -r`

> >     +        - sudo apt-get install libpcap-dev linux-headers-`uname -r`

> >     libcunit1-dev

> >              - sudo pip install coverage

> >              - gem install asciidoctor

> >              - PATH=${PATH//:\.\/node_modules\/\.bin/}

> >

> >     -#       Install cunit for the validation tests because distro

> >     version is too old and fails C99 compile

> >     -        - export CUNIT_VERSION=2.1-3

> >     -        - curl -sSOL

> >     http://sourceforge.net/projects/cunit/files/CUnit/${

> CUNIT_VERSION}/CUnit-${CUNIT_VERSION}.tar.bz2

> >     <http://sourceforge.net/projects/cunit/files/CUnit/${

> CUNIT_VERSION}/CUnit-${CUNIT_VERSION}.tar.bz2>

> >     -        - tar -jxf *.bz2

> >     -        - cd CUnit*

> >     -        - ./bootstrap

> >     -        - ./configure --enable-debug --enable-automated

> >     --enable-basic --enable-console --enable-examples --enable-test

> >     -        - make

> >     -        - sudo make install

> >     -        - cd ..

> >     -        - export LD_LIBRARY_PATH="/usr/local/lib:$LD_LIBRARY_PATH"

> >     -

> >      #      DPDK pktio

> >              - TARGET=${TARGET:-"x86_64-native-linuxapp-gcc"}

> >              - git -c advice.detachedHead=false clone -q --depth=1

> >     --single-branch --branch=v16.07 http://dpdk.org/git/dpdk dpdk

> >     @@ -124,7 +113,7 @@ script:

> >              - sudo rm -rf $KSRC

> >

> >      after_success:

> >     -  - if [ -n "$DOCOV" ]; then find . -type f -iname '*.[ch]' -not

> >     -path ".git/*" -execdir gcov-4.8 {} \; ; bash <(curl -s

> >     https://codecov.io/bash) -X coveragepy; fi

> >     +  - if [ -n "$DOCOV" ]; then find . -type f -iname '*.[ch]' -not

> >     -path ".git/*" -execdir gcov {} \; ; bash <(curl -s

> >     https://codecov.io/bash) -X coveragepy; fi

> >

> >      addons:

> >          coverity_scan:

> >     --

> >     2.11.0.295.gd7dffce

> >

> >

> >

> >

> > --

> > Mike Holmes

> > Program Manager - Linaro Networking Group

> > Linaro.org <http://www.linaro.org/>* **│ *Open source software for ARM

> SoCs

> > "Work should be fun and collaborative, the rest follows"

> >

> > __

> >

> >

>

>



-- 
Mike Holmes
Program Manager - Linaro Networking Group
Linaro.org <http://www.linaro.org/> *│ *Open source software for ARM SoCs
"Work should be fun and collaborative, the rest follows"
diff mbox

Patch

diff --git a/.travis.yml b/.travis.yml
index 9544ec8f..90602b64 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,7 @@ 
 
 language: c
 sudo: required
+dist: trusty
 env:
   global:
     # COVERITY_SCAN_TOKEN
@@ -34,13 +35,13 @@  env:
 
 matrix:
   include:
-    - compiler: gcc-4.8
+    - compiler: gcc
       addons:
         apt:
           sources:
             - ubuntu-toolchain-r-test
           packages:
-            - gcc-4.8
+            - gcc
       env: MY_CF="-O0 -coverage" MY_LDF="--coverage" DOCOV=1
     - compiler: clang
       addons:
@@ -55,23 +56,11 @@  before_install:
 
         - sudo apt-get -qq update
         - sudo apt-get install automake autoconf libtool libssl-dev graphviz mscgen doxygen
-        - sudo apt-get install libpcap-dev linux-headers-`uname -r`
+        - sudo apt-get install libpcap-dev linux-headers-`uname -r` libcunit1-dev
         - sudo pip install coverage
         - gem install asciidoctor
         - PATH=${PATH//:\.\/node_modules\/\.bin/}
 
-#       Install cunit for the validation tests because distro version is too old and fails C99 compile
-        - export CUNIT_VERSION=2.1-3
-        - curl -sSOL http://sourceforge.net/projects/cunit/files/CUnit/${CUNIT_VERSION}/CUnit-${CUNIT_VERSION}.tar.bz2
-        - tar -jxf *.bz2
-        - cd CUnit*
-        - ./bootstrap
-        - ./configure --enable-debug --enable-automated --enable-basic --enable-console --enable-examples --enable-test
-        - make
-        - sudo make install
-        - cd ..
-        - export LD_LIBRARY_PATH="/usr/local/lib:$LD_LIBRARY_PATH"
-
 #	DPDK pktio
         - TARGET=${TARGET:-"x86_64-native-linuxapp-gcc"}
         - git -c advice.detachedHead=false clone -q --depth=1 --single-branch --branch=v16.07 http://dpdk.org/git/dpdk dpdk
@@ -124,7 +113,7 @@  script:
         - sudo rm -rf $KSRC
 
 after_success:
-  - if [ -n "$DOCOV" ]; then find . -type f -iname '*.[ch]' -not -path ".git/*" -execdir gcov-4.8 {} \; ; bash <(curl -s https://codecov.io/bash) -X coveragepy; fi
+  - if [ -n "$DOCOV" ]; then find . -type f -iname '*.[ch]' -not -path ".git/*" -execdir gcov {} \; ; bash <(curl -s https://codecov.io/bash) -X coveragepy; fi
 
 addons:
     coverity_scan: