chore: Remove astyle from travis build.

The astyle check is now done by restyled.
2025-12-06 20:46:34 +01:00 · 2020-05-04 21:18:38 +01:00
parent b334622d36
commit b5ace27a3e
4 changed files with 43 additions and 45 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,37 +4,35 @@ python: nightly
 dist: xenial
 os: linux

-addons:
-  apt:
-    packages:
-      - astyle
-      - libalut-dev
-      - libconfig-dev
-      - libnotify-dev
-      - libopenal-dev
-      - libopus-dev
-      - libqrencode-dev
-      - libvpx-dev
+jobs:
+  include:
+    - env: JOB=linux

-cache:
-  directories:
-    - $HOME/cache
+      addons:
+        apt:
+          packages:
+            - libalut-dev
+            - libconfig-dev
+            - libnotify-dev
+            - libopenal-dev
+            - libopus-dev
+            - libqrencode-dev
+            - libvpx-dev

-install:
-  # Where to find libraries.
-  - export LD_LIBRARY_PATH=$HOME/cache/usr/lib
-  - export PKG_CONFIG_PATH=$HOME/cache/usr/lib/pkgconfig
-  # c-sodium
-  - git clone --depth=1 --branch=stable https://github.com/jedisct1/libsodium ../libsodium
-  - test -f $HOME/cache/usr/lib/libsodium.so || (cd ../libsodium && ./configure --prefix=$HOME/cache/usr && make install -j$(nproc))
-  # c-toxcore
-  - git clone --depth=1 https://github.com/TokTok/c-toxcore ../c-toxcore
-  - test -f $HOME/cache/usr/lib/libtoxcore.so || (cd ../c-toxcore && cmake -B_build -H. -DCMAKE_INSTALL_PREFIX:PATH=$HOME/cache/usr && make -C_build install -j$(nproc))
-  # astyle
-  - wget -O ../astyle.tar.gz https://deb.debian.org/debian/pool/main/a/astyle/astyle_2.06.orig.tar.gz
-  - test -f $HOME/cache/astyle/build/gcc/bin/astyle || (tar -xf ../astyle.tar.gz -C "$HOME/cache" && make -C "$HOME/cache/astyle/build/gcc" -j2)
+      cache:
+        directories:
+          - $HOME/cache

-script:
-  - $HOME/cache/astyle/build/gcc/bin/astyle --options=astylerc $(find . -name "*.[ch]")
-  - git diff --exit-code
-  - make ENABLE_PYTHON=1 -j2
+      install:
+        # Where to find libraries.
+        - export LD_LIBRARY_PATH=$HOME/cache/usr/lib
+        - export PKG_CONFIG_PATH=$HOME/cache/usr/lib/pkgconfig
+        # c-sodium
+        - git clone --depth=1 --branch=stable https://github.com/jedisct1/libsodium ../libsodium
+        - test -f $HOME/cache/usr/lib/libsodium.so || (cd ../libsodium && ./configure --prefix=$HOME/cache/usr && make install -j$(nproc))
+        # c-toxcore
+        - git clone --depth=1 https://github.com/TokTok/c-toxcore ../c-toxcore
+        - test -f $HOME/cache/usr/lib/libtoxcore.so || (cd ../c-toxcore && cmake -B_build -H. -DCMAKE_INSTALL_PREFIX:PATH=$HOME/cache/usr && make -C_build install -j$(nproc))
+
+      script:
+        - make ENABLE_PYTHON=1 -j$(nproc)