travis: update to bionic
diff mbox series

Message ID 1561664979-15976-1-git-send-email-pjtexier@koncepto.io
State Accepted
Headers show
Series
  • travis: update to bionic
Related show

Commit Message

'Pierre-Jean Texier' via swupdate June 27, 2019, 7:49 p.m. UTC
The curl MIME API was added to curl version 7.56.0.
So, bump to 7.58.0 with bionic.

Fixes:

 In file included from /usr/include/curl/curl.h:2402:0,
                 from handlers/swuforward_handler.h:11,
                 from handlers/swuforward_handler.c:38:
 handlers/swuforward_handler.c:175:43: error: ‘CURLOPT_MIMEPOST’ undeclared (first use in this function)
      (curl_easy_setopt(conn->curl_handle, CURLOPT_MIMEPOST,

Also add:
 - liburiparser
 - libwebsocket (fetched from github)

Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io>
---
See https://travis-ci.com/bdx-iot/swupdate/builds/117202794

 .travis.yml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

Comments

Stefano Babic June 27, 2019, 8:57 p.m. UTC | #1
Hi Pierre,

On 27/06/19 21:49, 'Pierre-Jean Texier' via swupdate wrote:
> The curl MIME API was added to curl version 7.56.0.
> So, bump to 7.58.0 with bionic.
> 
> Fixes:
> 
>  In file included from /usr/include/curl/curl.h:2402:0,
>                  from handlers/swuforward_handler.h:11,
>                  from handlers/swuforward_handler.c:38:
>  handlers/swuforward_handler.c:175:43: error: ‘CURLOPT_MIMEPOST’ undeclared (first use in this function)
>       (curl_easy_setopt(conn->curl_handle, CURLOPT_MIMEPOST,
> 
> Also add:
>  - liburiparser
>  - libwebsocket (fetched from github)
> 
> Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io>
> ---
> See https://travis-ci.com/bdx-iot/swupdate/builds/117202794
> 
>  .travis.yml | 14 +++++++++-----
>  1 file changed, 9 insertions(+), 5 deletions(-)
> 
> diff --git a/.travis.yml b/.travis.yml
> index 59d3776..5979153 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -1,5 +1,5 @@
>  
> -dist: xenial
> +dist: bionic
>  sudo: required
>  
>  language: c
> @@ -9,11 +9,10 @@ before_install:
>      - sudo apt-get install -y build-essential
>      - sudo apt-get install -y automake
>      - sudo apt-get install -y libzmq3-dev
> -    - sudo apt-get install -y libcurl4-openssl-dev
>      - sudo apt-get install -y liblua5.2-dev
>      - sudo apt-get install -y libconfig-dev
>      - sudo apt-get install -y libarchive-dev
> -    - sudo apt-get install -y libjson0-dev
> +    - sudo apt-get install -y libjson-c-dev
>      - sudo apt-get install -y zlib1g-dev
>      - sudo apt-get install -y git
>      - sudo apt-get install -y uuid
> @@ -24,6 +23,7 @@ before_install:
>      - sudo apt-get install -y check
>      - sudo apt-get install -y librsync1
>      - sudo apt-get install -y librsync-dev
> +    - sudo apt-get install -y liburiparser-dev
>      - sudo apt-get install -y doxygen
>      - sudo apt-get install -y graphviz
>      - sudo apt-get install -y autoconf-archive
> @@ -51,6 +51,12 @@ script:
>      - make
>      - sudo make install
>      - cd ..
> +    - git clone https://github.com/warmcat/libwebsockets.git
> +    - cd libwebsockets
> +    - cmake .
> +    - make
> +    - sudo make install
> +    - cd ..
>      - git clone https://github.com/siemens/efibootguard.git
>      - cd efibootguard
>      - autoreconf -fi
> @@ -68,6 +74,4 @@ script:
>      - make
>      - sudo make install
>      - cd ..
> -    # Accommodate to trusty's rusty systemd version
> -    - sudo ln -sf /lib/x86_64-linux-gnu/libsystemd-daemon.so.0 /lib/x86_64-linux-gnu/libsystemd.so
>      - for i in configs/*;do echo $i;make `basename $i` && make || exit 1;done
> 


Many thanks for the quick fix ! I have already applied it.

Best regards,
Stefano
'Pierre-Jean Texier' via swupdate June 27, 2019, 9:44 p.m. UTC | #2
Hi Stefano,

Le 27/06/2019 à 22:57, Stefano Babic a écrit :
> Many thanks for the quick fix ! I have already applied it.

With pleasure ;)

Thanks !

Patch
diff mbox series

diff --git a/.travis.yml b/.travis.yml
index 59d3776..5979153 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@ 
 
-dist: xenial
+dist: bionic
 sudo: required
 
 language: c
@@ -9,11 +9,10 @@  before_install:
     - sudo apt-get install -y build-essential
     - sudo apt-get install -y automake
     - sudo apt-get install -y libzmq3-dev
-    - sudo apt-get install -y libcurl4-openssl-dev
     - sudo apt-get install -y liblua5.2-dev
     - sudo apt-get install -y libconfig-dev
     - sudo apt-get install -y libarchive-dev
-    - sudo apt-get install -y libjson0-dev
+    - sudo apt-get install -y libjson-c-dev
     - sudo apt-get install -y zlib1g-dev
     - sudo apt-get install -y git
     - sudo apt-get install -y uuid
@@ -24,6 +23,7 @@  before_install:
     - sudo apt-get install -y check
     - sudo apt-get install -y librsync1
     - sudo apt-get install -y librsync-dev
+    - sudo apt-get install -y liburiparser-dev
     - sudo apt-get install -y doxygen
     - sudo apt-get install -y graphviz
     - sudo apt-get install -y autoconf-archive
@@ -51,6 +51,12 @@  script:
     - make
     - sudo make install
     - cd ..
+    - git clone https://github.com/warmcat/libwebsockets.git
+    - cd libwebsockets
+    - cmake .
+    - make
+    - sudo make install
+    - cd ..
     - git clone https://github.com/siemens/efibootguard.git
     - cd efibootguard
     - autoreconf -fi
@@ -68,6 +74,4 @@  script:
     - make
     - sudo make install
     - cd ..
-    # Accommodate to trusty's rusty systemd version
-    - sudo ln -sf /lib/x86_64-linux-gnu/libsystemd-daemon.so.0 /lib/x86_64-linux-gnu/libsystemd.so
     - for i in configs/*;do echo $i;make `basename $i` && make || exit 1;done