Bump container versions for CI
MODIFY
.github/workflows/opencv-rust.yml
.github/workflows/opencv-rust.yml
@@ -14,9 +14,9 @@ jobs:
fail-fast: false
matrix:
os:
- - image: ubuntu-18.04
+ - image: ubuntu-20.04
family: linux
- - image: macos-10.15
+ - image: macos-11
family: osx
rust:
- stable
@@ -81,7 +81,7 @@ jobs:
fail-fast: false
matrix:
os:
- - image: ubuntu-18.04
+ - image: ubuntu-20.04
family: linux
- image: windows-2019
family: windows
@@ -131,7 +131,7 @@ jobs:
fail-fast: false
matrix:
os:
- - image: macos-10.15
+ - image: macos-11
family: osx
- image: windows-2019
family: windows

MODIFY
ci/install-bionic.sh
ci/install-bionic.sh
@@ -8,186 +8,4 @@ sudo apt-get install -y clang
# workaround to make clang_sys crate detect installed libclang
sudo ln -s libclang.so.1 /usr/lib/llvm-6.0/lib/libclang.so
-if [[ "$OPENCV_VERSION" == "3.2.0" ]]; then
sudo apt-get -y install libopencv-dev=3.2.0*
-else
- # runtime deps
- sudo apt-get -y install \
- libatlas3-base \
- libavcodec57 \
- libavformat57 \
- libavresample3 \
- libceres1 \
- libdc1394-22 \
- libfreetype6 \
- libgdal20 \
- libgflags2.2 \
- libgoogle-glog0v5 \
- libgphoto2-6 \
- libgstreamer-plugins-base1.0-0 \
- libharfbuzz0b \
- libhdf5-100 \
- libjpeg8 \
- liblapacke \
- liblept5 \
- libopenexr22 \
- libpng16-16 \
- libswscale4 \
- libtbb2 \
- libtesseract4 \
- libvtk7.1 \
- libwebp6 \
- libqt5core5a \
- libqt5gui5 \
- libqt5opengl5 \
- libqt5test5 \
- libqt5widgets5
-
- # build deps
- sudo apt-get -y install \
- build-essential \
- cmake \
- libatlas-base-dev \
- libavcodec-dev \
- libavformat-dev \
- libavresample-dev \
- libceres-dev \
- libdc1394-22-dev \
- libeigen3-dev \
- libfreetype6-dev \
- libgdal-dev \
- libgflags-dev \
- libgoogle-glog-dev \
- libgphoto2-dev \
- libgstreamer-plugins-base1.0-dev \
- libharfbuzz-dev \
- libhdf5-dev \
- libjpeg-dev \
- liblapacke-dev \
- libleptonica-dev \
- libopenexr-dev \
- libpng-dev \
- libswscale-dev \
- libtbb-dev \
- libtesseract-dev \
- libtiff-dev \
- libvtk7-dev \
- libwebp-dev \
- qtbase5-dev
-
- BUILD_FLAGS="
- -D BUILD_CUDA_STUBS=OFF
- -D BUILD_DOCS=OFF
- -D BUILD_EXAMPLES=OFF
- -D BUILD_IPP_IW=ON
- -D BUILD_ITT=ON
- -D BUILD_JASPER=OFF
- -D BUILD_JAVA=OFF
- -D BUILD_JPEG=OFF
- -D BUILD_OPENEXR=OFF
- -D BUILD_PERF_TESTS=OFF
- -D BUILD_PNG=OFF
- -D BUILD_PROTOBUF=ON
- -D BUILD_SHARED_LIBS=ON
- -D BUILD_TBB=OFF
- -D BUILD_TESTS=OFF
- -D BUILD_TIFF=OFF
- -D BUILD_WEBP=OFF
- -D BUILD_WITH_DEBUG_INFO=OFF
- -D BUILD_WITH_DYNAMIC_IPP=OFF
- -D BUILD_ZLIB=OFF
- -D BUILD_opencv_apps=ALL
- -D BUILD_opencv_python2=OFF
- -D BUILD_opencv_python3=OFF
- -D CMAKE_BUILD_TYPE=Release
- -D CMAKE_INSTALL_PREFIX=/usr
- -D CV_DISABLE_OPTIMIZATION=OFF
- -D ENABLE_CONFIG_VERIFICATION=OFF
- -D ENABLE_FAST_MATH=OFF
- -D CV_ENABLE_INTRINSICS=ON
- -D ENABLE_LTO=OFF
- -D ENABLE_PIC=ON
- -D ENABLE_PRECOMPILED_HEADERS=OFF
- -D INSTALL_CREATE_DISTRIB=OFF
- -D INSTALL_PYTHON_EXAMPLES=OFF
- -D INSTALL_C_EXAMPLES=OFF
- -D INSTALL_TESTS=OFF
- -D OPENCV_ENABLE_NONFREE=ON
- -D OPENCV_FORCE_3RDPARTY_BUILD=OFF
- -D OPENCV_GENERATE_PKGCONFIG=OFF
- -D PROTOBUF_UPDATE_FILES=OFF
- -D WITH_1394=ON
- -D WITH_ADE=ON
- -D WITH_ARAVIS=OFF
- -D WITH_CLP=OFF
- -D WITH_CUDA=OFF
- -D WITH_EIGEN=ON
- -D WITH_FFMPEG=ON
- -D WITH_GDAL=ON
- -D WITH_GDCM=OFF
- -D WITH_GIGEAPI=OFF
- -D WITH_GPHOTO2=ON
- -D WITH_GSTREAMER=ON
- -D WITH_GSTREAMER_0_10=OFF
- -D WITH_GTK=OFF
- -D WITH_GTK_2_X=OFF
- -D WITH_HALIDE=OFF
- -D WITH_IMGCODEC_HDcR=ON
- -D WITH_IMGCODEC_PXM=ON
- -D WITH_IMGCODEC_SUNRASTER=ON
- -D WITH_INF_ENGINE=OFF
- -D WITH_IPP=ON
- -D WITH_ITT=ON
- -D WITH_JASPER=OFF
- -D WITH_JPEG=ON
- -D WITH_LAPACK=ON
- -D WITH_LIBV4L=OFF
- -D WITH_MATLAB=OFF
- -D WITH_MFX=OFF
- -D WITH_OPENCL=OFF
- -D WITH_OPENCLAMDBLAS=OFF
- -D WITH_OPENCLAMDFFT=OFF
- -D WITH_OPENCL_SVM=OFF
- -D WITH_OPENEXR=ON
- -D WITH_OPENGL=ON
- -D WITH_OPENMP=OFF
- -D WITH_OPENNI=OFF
- -D WITH_OPENNI2=OFF
- -D WITH_OPENVX=OFF
- -D WITH_PNG=ON
- -D WITH_PROTOBUF=ON
- -D WITH_PTHREADS_PF=ON
- -D WITH_PVAPI=OFF
- -D WITH_QT=ON
- -D WITH_QUIRC=ON
- -D WITH_TBB=ON
- -D WITH_TIFF=ON
- -D WITH_UNICAP=OFF
- -D WITH_V4L=ON
- -D WITH_VA=ON
- -D WITH_VA_INTEL=ON
- -D WITH_VTK=ON
- -D WITH_WEBP=ON
- -D WITH_XIMEA=OFF
- -D WITH_XINE=OFF
- -D OPENCV_ENABLE_MEMALIGN=OFF
- "
-
- base_dir="$HOME/build/opencv/"
- mkdir -p "$base_dir"
-
- curl -L "https://github.com/opencv/opencv/archive/$OPENCV_VERSION.tar.gz" | tar -xzC "$base_dir"
- curl -L "https://github.com/opencv/opencv_contrib/archive/$OPENCV_VERSION.tar.gz" | tar -xzC "$base_dir"
-
- build_dir="$base_dir/opencv-$OPENCV_VERSION-build/"
- mkdir -p "$build_dir"
-
- pushd "$build_dir" > /dev/null
- cmake $BUILD_FLAGS \
- -D CMAKE_INSTALL_PREFIX=/usr \
- -D OPENCV_EXTRA_MODULES_PATH="$base_dir/opencv_contrib-$OPENCV_VERSION/modules" \
- "$base_dir/opencv-$OPENCV_VERSION"
- make -j"$(nproc)"
- sudo make -j"$(nproc)" install
- popd > /dev/null
-fi

RENAME
ci/install-bionic-vcpkg.sh
ci/install-focal-vcpkg.sh
@@ -18,9 +18,9 @@ git checkout "$VCPKG_TREE_COMMIT"
echo "set(VCPKG_BUILD_TYPE release)" >> triplets/x64-linux.cmake
export VCPKG_DEFAULT_TRIPLET=x64-linux
#./vcpkg install llvm # takes very long time
-sudo apt-get install -y clang
+sudo apt-get install -y clang libharfbuzz0b
# workaround to make clang_sys crate detect installed libclang
-sudo ln -s libclang.so.1 /usr/lib/llvm-6.0/lib/libclang.so
+sudo ln -s libclang.so.1 /usr/lib/llvm-10/lib/libclang.so
./vcpkg upgrade --no-dry-run
./vcpkg install --recurse "opencv${VCPKG_OPENCV_VERSION}[contrib,nonfree]"
popd

ADD
ci/install-focal.sh
+#!/bin/bash
+
+set -vex
+
+sudo apt-get update
+
+sudo apt-get install -y clang
+# workaround to make clang_sys crate detect installed libclang
+sudo ln -s libclang.so.1 /usr/lib/llvm-10/lib/libclang.so
+
+# runtime deps
+sudo apt-get -y install \
+ libatlas3-base \
+ libavcodec58 \
+ libavformat58 \
+ libavresample4 \
+ libceres1 \
+ libdc1394-22 \
+ libfreetype6 \
+ libgdal26 \
+ libgflags2.2 \
+ libgoogle-glog0v5 \
+ libgphoto2-6 \
+ libgstreamer-plugins-base1.0-0 \
+ libharfbuzz0b \
+ libhdf5-103 \
+ libjpeg8 \
+ liblapacke \
+ liblept5 \
+ libopenexr24 \
+ libpng16-16 \
+ libswscale5 \
+ libtbb2 \
+ libtesseract4 \
+ libvtk7.1 \
+ libwebp6 \
+ libqt5core5a \
+ libqt5gui5 \
+ libqt5opengl5 \
+ libqt5test5 \
+ libqt5widgets5
+# build deps
+sudo apt-get -y install \
+ build-essential \
+ cmake \
+ libatlas-base-dev \
+ libavcodec-dev \
+ libavformat-dev \
+ libavresample-dev \
+ libceres-dev \
+ libdc1394-22-dev \
+ libeigen3-dev \
+ libfreetype6-dev \
+ libgdal-dev \
+ libgflags-dev \
+ libgoogle-glog-dev \
+ libgphoto2-dev \
+ libgstreamer-plugins-base1.0-dev \
+ libharfbuzz-dev \
+ libhdf5-dev \
+ libjpeg-dev \
+ liblapacke-dev \
+ libleptonica-dev \
+ libopenexr-dev \
+ libpng-dev \
+ libswscale-dev \
+ libtbb-dev \
+ libtesseract-dev \
+ libtiff-dev \
+ libvtk7-dev \
+ libwebp-dev \
+ qtbase5-dev
+BUILD_FLAGS="
+ -D BUILD_CUDA_STUBS=OFF
+ -D BUILD_DOCS=OFF
+ -D BUILD_EXAMPLES=OFF
+ -D BUILD_IPP_IW=ON
+ -D BUILD_ITT=ON
+ -D BUILD_JASPER=OFF
+ -D BUILD_JAVA=OFF
+ -D BUILD_JPEG=OFF
+ -D BUILD_OPENEXR=OFF
+ -D BUILD_PERF_TESTS=OFF
+ -D BUILD_PNG=OFF
+ -D BUILD_PROTOBUF=ON
+ -D BUILD_SHARED_LIBS=ON
+ -D BUILD_TBB=OFF
+ -D BUILD_TESTS=OFF
+ -D BUILD_TIFF=OFF
+ -D BUILD_WEBP=OFF
+ -D BUILD_WITH_DEBUG_INFO=OFF
+ -D BUILD_WITH_DYNAMIC_IPP=OFF
+ -D BUILD_ZLIB=OFF
+ -D BUILD_opencv_apps=ALL
+ -D BUILD_opencv_python2=OFF
+ -D BUILD_opencv_python3=OFF
+ -D CMAKE_BUILD_TYPE=Release
+ -D CMAKE_INSTALL_PREFIX=/usr
+ -D CV_DISABLE_OPTIMIZATION=OFF
+ -D ENABLE_CONFIG_VERIFICATION=OFF
+ -D ENABLE_FAST_MATH=OFF
+ -D CV_ENABLE_INTRINSICS=ON
+ -D ENABLE_LTO=OFF
+ -D ENABLE_PIC=ON
+ -D ENABLE_PRECOMPILED_HEADERS=OFF
+ -D INSTALL_CREATE_DISTRIB=OFF
+ -D INSTALL_PYTHON_EXAMPLES=OFF
+ -D INSTALL_C_EXAMPLES=OFF
+ -D INSTALL_TESTS=OFF
+ -D OPENCV_ENABLE_NONFREE=ON
+ -D OPENCV_FORCE_3RDPARTY_BUILD=OFF
+ -D OPENCV_GENERATE_PKGCONFIG=OFF
+ -D PROTOBUF_UPDATE_FILES=OFF
+ -D WITH_1394=ON
+ -D WITH_ADE=ON
+ -D WITH_ARAVIS=OFF
+ -D WITH_CLP=OFF
+ -D WITH_CUDA=OFF
+ -D WITH_EIGEN=ON
+ -D WITH_FFMPEG=ON
+ -D WITH_GDAL=ON
+ -D WITH_GDCM=OFF
+ -D WITH_GIGEAPI=OFF
+ -D WITH_GPHOTO2=ON
+ -D WITH_GSTREAMER=ON
+ -D WITH_GSTREAMER_0_10=OFF
+ -D WITH_GTK=OFF
+ -D WITH_GTK_2_X=OFF
+ -D WITH_HALIDE=OFF
+ -D WITH_IMGCODEC_HDcR=ON
+ -D WITH_IMGCODEC_PXM=ON
+ -D WITH_IMGCODEC_SUNRASTER=ON
+ -D WITH_INF_ENGINE=OFF
+ -D WITH_IPP=ON
+ -D WITH_ITT=ON
+ -D WITH_JASPER=OFF
+ -D WITH_JPEG=ON
+ -D WITH_LAPACK=ON
+ -D WITH_LIBV4L=OFF
+ -D WITH_MATLAB=OFF
+ -D WITH_MFX=OFF
+ -D WITH_OPENCL=OFF
+ -D WITH_OPENCLAMDBLAS=OFF
+ -D WITH_OPENCLAMDFFT=OFF
+ -D WITH_OPENCL_SVM=OFF
+ -D WITH_OPENEXR=ON
+ -D WITH_OPENGL=ON
+ -D WITH_OPENMP=OFF
+ -D WITH_OPENNI=OFF
+ -D WITH_OPENNI2=OFF
+ -D WITH_OPENVX=OFF
+ -D WITH_PNG=ON
+ -D WITH_PROTOBUF=ON
+ -D WITH_PTHREADS_PF=ON
+ -D WITH_PVAPI=OFF
+ -D WITH_QT=ON
+ -D WITH_QUIRC=ON
+ -D WITH_TBB=ON
+ -D WITH_TIFF=ON
+ -D WITH_UNICAP=OFF
+ -D WITH_V4L=ON
+ -D WITH_VA=ON
+ -D WITH_VA_INTEL=ON
+ -D WITH_VTK=ON
+ -D WITH_WEBP=ON
+ -D WITH_XIMEA=OFF
+ -D WITH_XINE=OFF
+ -D OPENCV_ENABLE_MEMALIGN=OFF
+"
+base_dir="$HOME/build/opencv/"
+mkdir -p "$base_dir"
+curl -L "https://github.com/opencv/opencv/archive/$OPENCV_VERSION.tar.gz" | tar -xzC "$base_dir"
+curl -L "https://github.com/opencv/opencv_contrib/archive/$OPENCV_VERSION.tar.gz" | tar -xzC "$base_dir"
+build_dir="$base_dir/opencv-$OPENCV_VERSION-build/"
+mkdir -p "$build_dir"
+pushd "$build_dir" > /dev/null
+cmake $BUILD_FLAGS \
+ -D CMAKE_INSTALL_PREFIX=/usr \
+ -D OPENCV_EXTRA_MODULES_PATH="$base_dir/opencv_contrib-$OPENCV_VERSION/modules" \
+ "$base_dir/opencv-$OPENCV_VERSION"
+make -j"$(nproc)"
+sudo make -j"$(nproc)" install
+popd > /dev/null

MODIFY
ci/install.sh
ci/install.sh
@@ -6,9 +6,11 @@ ci_dir="$(dirname "$0")"
if [[ "$OS_FAMILY" == "linux" ]]; then
if [[ "$VCPKG_OPENCV_VERSION" != "" ]]; then # vcpkg build
- "$ci_dir/install-bionic-vcpkg.sh"
- else
+ "$ci_dir/install-focal-vcpkg.sh"
+ elif [[ "$OPENCV_VERSION" == "3.2.0" ]]; then
"$ci_dir/install-bionic.sh"
+ else
+ "$ci_dir/install-focal.sh"
fi
elif [[ "$OS_FAMILY" == "osx" ]]; then
if [[ "$BREW_OPENCV_VERSION" != "" ]]; then # brew build

Bump container versions for CI