Use apt and homebrew addons in Travis to install packages instead of manual method

Author: Ondřej Surý

.travis.yml

@@ -40,16 +40,30 @@ branches:
 
 addons:
   apt:
+    packages:
+    - abi-dumper
+    - abi-compliance-checker
+    - pkg-config
+    - w3m
+    - curl
+    - valgrind
+    - libpcre3-dev
+    - python3-dev
+    - python3-cffi
+    - python3-setuptools
+    - python3-pip
+    - swig
+    update: true
+  homebrew:
+    packages:
+    - curl
     update: true
 
 before_install:
-  - if [ "$DEPLOY_BUILD" = "TRUE" ]; then sudo apt-get -y install abi-dumper abi-compliance-checker pkg-config w3m; fi
   - git clone git://git.cryptomilk.org/projects/cmocka.git
   - cd cmocka && mkdir build && cd build
   - cmake .. && make -j2 && sudo make install
   - cd ../..
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update; fi
-  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get update -qq; sudo apt-get install -y valgrind libpcre3-dev python3-dev swig; fi
   - if [ "$DEPLOY_BUILD" = "TRUE" ]; then pip3 install --user codecov==2.0.22; export CFLAGS="-coverage"; fi
 
 script: