Travis Boost 1.70.0 NDK r20

RGPaul · Jun 13, 2019 · 6acd106 · 6acd106
1 parent 82d66a0
commit 6acd106
Showing 1 changed file with 5 additions and 173 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -28,11 +28,11 @@ before_install:
 matrix:
   include:
 
-    ### Boost 1.70.0 - NDK r19c ###
+    ### Boost 1.70.0 - NDK r20 ###
     # arm64-v8a
     - os: linux
       env:
-        - TRAVIS_ANDROID_NDK_VERSION=r19c
+        - TRAVIS_ANDROID_NDK_VERSION=r20
         - TRAVIS_BOOST_VERSION=1.70.0
         - TRAVIS_ANDROID_ARCH=arm64-v8a
       addons:
@@ -43,7 +43,7 @@ matrix:
     # armeabi-v7a
     - os: linux
       env:
-        - TRAVIS_ANDROID_NDK_VERSION=r19c
+        - TRAVIS_ANDROID_NDK_VERSION=r20
         - TRAVIS_BOOST_VERSION=1.70.0
         - TRAVIS_ANDROID_ARCH=armeabi-v7a
       addons:
@@ -54,7 +54,7 @@ matrix:
     # x86
     - os: linux
       env:
-        - TRAVIS_ANDROID_NDK_VERSION=r19c
+        - TRAVIS_ANDROID_NDK_VERSION=r20
         - TRAVIS_BOOST_VERSION=1.70.0
         - TRAVIS_ANDROID_ARCH=x86
       addons:
@@ -65,182 +65,14 @@ matrix:
     # x86_64
     - os: linux
       env:
-        - TRAVIS_ANDROID_NDK_VERSION=r19c
+        - TRAVIS_ANDROID_NDK_VERSION=r20
         - TRAVIS_BOOST_VERSION=1.70.0
         - TRAVIS_ANDROID_ARCH=x86_64
       addons:
       apt:
         sources: ['ubuntu-toolchain-r-test']
         packages: ['g++-5' ]
 
-    ### Boost 1.70.0 - NDK r18b ###
-    # arm64-v8a
-    - os: linux
-      env:
-        - TRAVIS_ANDROID_NDK_VERSION=r18b
-        - TRAVIS_BOOST_VERSION=1.70.0
-        - TRAVIS_ANDROID_ARCH=arm64-v8a
-      addons:
-      apt:
-        sources: ['ubuntu-toolchain-r-test']
-        packages: ['g++-5' ]
-
-    # armeabi-v7a
-    - os: linux
-      env:
-        - TRAVIS_ANDROID_NDK_VERSION=r18b
-        - TRAVIS_BOOST_VERSION=1.70.0
-        - TRAVIS_ANDROID_ARCH=armeabi-v7a
-      addons:
-      apt:
-        sources: ['ubuntu-toolchain-r-test']
-        packages: ['g++-5' ]
-
-    # x86
-    - os: linux
-      env:
-        - TRAVIS_ANDROID_NDK_VERSION=r18b
-        - TRAVIS_BOOST_VERSION=1.70.0
-        - TRAVIS_ANDROID_ARCH=x86
-      addons:
-      apt:
-        sources: ['ubuntu-toolchain-r-test']
-        packages: ['g++-5' ]
-
-    # x86_64
-    - os: linux
-      env:
-        - TRAVIS_ANDROID_NDK_VERSION=r18b
-        - TRAVIS_BOOST_VERSION=1.70.0
-        - TRAVIS_ANDROID_ARCH=x86_64
-      addons:
-      apt:
-        sources: ['ubuntu-toolchain-r-test']
-        packages: ['g++-5' ]
-
-    ### Boost 1.70.0 - NDK r17c ###
-    # arm64-v8a
-    - os: linux
-      env:
-        - TRAVIS_ANDROID_NDK_VERSION=r17c
-        - TRAVIS_BOOST_VERSION=1.70.0
-        - TRAVIS_ANDROID_ARCH=arm64-v8a
-      addons:
-      apt:
-        sources: ['ubuntu-toolchain-r-test']
-        packages: ['g++-5' ]
-
-    # armeabi-v7a
-    - os: linux
-      env:
-        - TRAVIS_ANDROID_NDK_VERSION=r17c
-        - TRAVIS_BOOST_VERSION=1.70.0
-        - TRAVIS_ANDROID_ARCH=armeabi-v7a
-      addons:
-      apt:
-        sources: ['ubuntu-toolchain-r-test']
-        packages: ['g++-5' ]
-
-    # x86
-    - os: linux
-      env:
-        - TRAVIS_ANDROID_NDK_VERSION=r17c
-        - TRAVIS_BOOST_VERSION=1.70.0
-        - TRAVIS_ANDROID_ARCH=x86
-      addons:
-      apt:
-        sources: ['ubuntu-toolchain-r-test']
-        packages: ['g++-5' ]
-
-    # x86_64
-    - os: linux
-      env:
-        - TRAVIS_ANDROID_NDK_VERSION=r17c
-        - TRAVIS_BOOST_VERSION=1.70.0
-        - TRAVIS_ANDROID_ARCH=x86_64
-      addons:
-      apt:
-        sources: ['ubuntu-toolchain-r-test']
-        packages: ['g++-5' ]
-
-    ### Boost 1.70.0 - NDK r16b ###
-    # arm64-v8a
-    - os: linux
-      env:
-        - TRAVIS_ANDROID_NDK_VERSION=r16b
-        - TRAVIS_BOOST_VERSION=1.70.0
-        - TRAVIS_ANDROID_ARCH=arm64-v8a
-      addons:
-      apt:
-        sources: ['ubuntu-toolchain-r-test']
-        packages: ['g++-5' ]
-
-    # armeabi-v7a
-    - os: linux
-      env:
-        - TRAVIS_ANDROID_NDK_VERSION=r16b
-        - TRAVIS_BOOST_VERSION=1.70.0
-        - TRAVIS_ANDROID_ARCH=armeabi-v7a
-      addons:
-      apt:
-        sources: ['ubuntu-toolchain-r-test']
-        packages: ['g++-5' ]
-
-    # x86
-    - os: linux
-      env:
-        - TRAVIS_ANDROID_NDK_VERSION=r16b
-        - TRAVIS_BOOST_VERSION=1.70.0
-        - TRAVIS_ANDROID_ARCH=x86
-      addons:
-      apt:
-        sources: ['ubuntu-toolchain-r-test']
-        packages: ['g++-5' ]
-
-    # x86_64
-    - os: linux
-      env:
-        - TRAVIS_ANDROID_NDK_VERSION=r16b
-        - TRAVIS_BOOST_VERSION=1.70.0
-        - TRAVIS_ANDROID_ARCH=x86_64
-      addons:
-      apt:
-        sources: ['ubuntu-toolchain-r-test']
-        packages: ['g++-5' ]
-
-    # armeabi
-    - os: linux
-      env:
-        - TRAVIS_ANDROID_NDK_VERSION=r16b
-        - TRAVIS_BOOST_VERSION=1.70.0
-        - TRAVIS_ANDROID_ARCH=armeabi
-      addons:
-      apt:
-        sources: ['ubuntu-toolchain-r-test']
-        packages: ['g++-5' ]
-
-    # mips
-    - os: linux
-      env:
-        - TRAVIS_ANDROID_NDK_VERSION=r16b
-        - TRAVIS_BOOST_VERSION=1.70.0
-        - TRAVIS_ANDROID_ARCH=mips
-      addons:
-      apt:
-        sources: ['ubuntu-toolchain-r-test']
-        packages: ['g++-5' ]
-
-    # mips64
-    - os: linux
-      env:
-        - TRAVIS_ANDROID_NDK_VERSION=r16b
-        - TRAVIS_BOOST_VERSION=1.70.0
-        - TRAVIS_ANDROID_ARCH=mips64
-      addons:
-      apt:
-        sources: ['ubuntu-toolchain-r-test']
-        packages: ['g++-5' ]
-
 ### build script
 script:
   # show OS/compiler version