Use CMake 3.16 in CI, fix OSX CI

Signed-off-by: Ralph Giles <giles@thaumas.net>
Signed-off-by: evpobr <evpobr@gmail.com>

.gitlab-ci.yml

@@ -23,10 +23,10 @@ cmake:
       apt-get install -y libopus-dev libogg-dev libssl-dev
         doxygen
   script:
-    - wget https://github.com/Kitware/CMake/releases/download/v3.20.3/cmake-3.20.3-linux-x86_64.tar.gz
-    - tar xzf cmake-3.20.3-linux-x86_64.tar.gz
-    - cmake-3.20.3-linux-x86_64/bin/cmake -Bbuild -H.
-    - cmake-3.20.3-linux-x86_64/bin/cmake --build build
+    - wget https://cmake.org/files/v3.16/cmake-3.16.9-Linux-x86_64.tar.gz
+    - tar xzf cmake-3.16.9-Linux-x86_64.tar.gz
+    - cmake-3.16.9-Linux-x86_64/bin/cmake -Bbuild -H.
+    - cmake-3.16.9-Linux-x86_64/bin/cmake --build build
   tags:
     - docker
 

.travis.yml

@@ -23,11 +23,16 @@ addons:
 
 env: PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/opt/openssl/lib/pkgconfig
 
+before_script:
+  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then
+      wget https://cmake.org/files/v3.16/cmake-3.16.9-Linux-x86_64.tar.gz
+      tar xzf cmake-3.16.9-Linux-x86_64.tar.gz
+      export PATH=/cmake-3.16.9-Linux-x86_64/bin:${PATH}
+    fi
+
 script:
-  - wget https://github.com/Kitware/CMake/releases/download/v3.20.3/cmake-3.20.3-linux-x86_64.tar.gz
-  - tar xzf cmake-3.20.3-linux-x86_64.tar.gz
-  - cmake-3.20.3-linux-x86_64/bin/cmake -Bbuild -H.
-  - cmake-3.20.3-linux-x86_64/bin/cmake --build build
+  - cmake -Bbuild -H.
+  - cmake --build build
   - ./autogen.sh
   - ./configure
   - make

Brewfile

@@ -5,3 +5,4 @@ brew 'autoconf'
 brew 'automake'
 brew 'libtool'
 brew 'pkg-config'
+brew 'cmake@3.16'