removed tiledb from ci

OSGeo · Apr 12, 2019 · dbadeb0 · dbadeb0
1 parent 5a176b1
commit dbadeb0
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/gdal/ci/travis/ubuntu_1804/before_install.sh b/gdal/ci/travis/ubuntu_1804/before_install.sh
@@ -47,8 +47,6 @@ sudo chroot "$chroot" apt-get install -y --allow-unauthenticated python-numpy li
 sudo chroot "$chroot" apt-get install -y doxygen texlive-latex-base make python-dev g++
 #sudo chroot "$chroot" apt-get install -y --allow-unauthenticated libsfcgal-dev
 sudo chroot "$chroot" apt-get install -y --allow-unauthenticated fossil libgeotiff-dev libcharls-dev libopenjp2-7-dev libcairo2-dev
-# TileDB
-sudo chroot "$chroot" apt-get install -y libtbb-dev
 
 # MSSQL: client side
 sudo chroot "$chroot" sh -c "curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -"
@@ -74,4 +72,3 @@ sudo chroot "$chroot" ldconfig
 
 wget https://github.com/mongodb/mongo-c-driver/releases/download/1.13.0/mongo-c-driver-1.13.0.tar.gz
 wget https://github.com/mongodb/mongo-cxx-driver/archive/r3.4.0.tar.gz
-wget -O TileDB-1.5.0.tar.gz https://github.com/TileDB-Inc/TileDB/archive/1.5.0.tar.gz
diff --git a/gdal/ci/travis/ubuntu_1804/install.sh b/gdal/ci/travis/ubuntu_1804/install.sh
@@ -41,12 +41,8 @@ chroot "$chroot" sh -c "cd $PWD/proj && ./autogen.sh && CC='ccache gcc' CXX='cca
 chroot "$chroot" sh -c "cd $PWD/proj && CCACHE_CPP2=yes make -j3"
 sudo chroot "$chroot" sh -c "cd $PWD/proj && make -j3 install && mv /usr/local/lib/libproj.so.15.0.0 /usr/local/lib/libinternalproj.so.15.0.0 && rm /usr/local/lib/libproj.so* && rm /usr/local/lib/libproj.a && rm /usr/local/lib/libproj.la && ln -s libinternalproj.so.15.0.0  /usr/local/lib/libinternalproj.so.15 && ln -s libinternalproj.so.15.0.0  /usr/local/lib/libinternalproj.so"
 
-# Build tiledb
-chroot "$chroot" sh -c "cd $PWD && tar xzf TileDB-1.5.0.tar.gz && cd TileDB-1.5.0 && mkdir build_cmake && cd build_cmake && ../bootstrap --prefix=/usr/local && make -j3"
-sudo chroot "$chroot" sh -c "cd $PWD/TileDB-1.5.0/build_cmake && make -j3 install-tiledb"
-
 # Configure GDAL
-chroot "$chroot" sh -c "cd $PWD/gdal && CCACHE_CPP2=yes CC='ccache gcc' CXX='ccache g++' LDFLAGS='-lstdc++' ./configure --prefix=/usr --without-libtool --with-jpeg12 --with-python --with-poppler --with-spatialite --with-mysql --with-liblzma --with-webp --with-epsilon --with-proj=/usr/local --with-poppler --with-hdf5 --with-dods-root=/usr --with-sosi --with-mysql --with-rasterlite2 --with-fgdb=$PWD/FileGDB_API-64gcc51 --with-tiledb"
+chroot "$chroot" sh -c "cd $PWD/gdal && CCACHE_CPP2=yes CC='ccache gcc' CXX='ccache g++' LDFLAGS='-lstdc++' ./configure --prefix=/usr --without-libtool --with-jpeg12 --with-python --with-poppler --with-spatialite --with-mysql --with-liblzma --with-webp --with-epsilon --with-proj=/usr/local --with-poppler --with-hdf5 --with-dods-root=/usr --with-sosi --with-mysql --with-rasterlite2 --with-fgdb=$PWD/FileGDB_API-64gcc51"
 # --enable-debug --with-podofo
 
 chroot "$chroot" sh -c "cd $PWD/gdal && make docs >docs_log.txt 2>&1"