commit 0efc4858d4bdf53bf981beabf883c110736637b6
author DRC <information@libjpeg-turbo.org> Mon Nov 09 18:55:21 2020 -0600
committer DRC <information@libjpeg-turbo.org> Mon Nov 09 19:02:28 2020 -0600
tree 1971cf6701eba796aa4f1a9951e33077ef7f1385
parent c7dd1912716d571352cce8c948825d763620553f
parent 02227e48a990911a6da35ab8034911a9fbc1055a

Merge branch 'master' into dev

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index feb2114..0070732 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -45,13 +45,10 @@
             - nasm
     - os: linux
       compiler: gcc
+      arch: ppc64le
       env:
         CMAKE_FLAGS="-DWITH_JPEG8=1"
         CTEST_OUTPUT_ON_FAILURE=1
-      addons:
-        apt:
-          packages:
-            - nasm
     - os: linux
       compiler: clang
       env:
@@ -64,11 +61,6 @@
       arch: arm64
       env:
         CTEST_OUTPUT_ON_FAILURE=1
-    - os: linux
-      compiler: gcc
-      arch: ppc64le
-      env:
-        CTEST_OUTPUT_ON_FAILURE=1
 
 before_install:
   - if [ "$BUILD_X32" = "1" ]; then