Skip to content

Commit 61bae62

Browse files
twistedfalltwistedfall
committed
Bump CI
1 parent a29d222 commit 61bae62

File tree

6 files changed

+85
-39
lines changed

6 files changed

+85
-39
lines changed

‎.github/workflows/opencv-rust.yml

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,25 @@ on:
66
pull_request:
77
branches:
88
- "*"
9+
permissions:
10+
contents: read
911
jobs:
1012
src:
1113
strategy:
1214
fail-fast: false
1315
matrix:
1416
os-image:
15-
- ubuntu-22.04
17+
- ubuntu-24.04
1618
- macos-14
1719
opencv-version:
1820
- 4.11.0
1921
linkage:
2022
- dynamic
2123
include:
22-
- os-image: ubuntu-22.04
24+
- os-image: ubuntu-24.04
2325
opencv-version: 4.11.0
2426
linkage: static
25-
- os-image: ubuntu-22.04
27+
- os-image: ubuntu-24.04
2628
opencv-version: 5.0.0-alpha
2729
linkage: dynamic
2830
- os-image: ubuntu-22.04
@@ -67,11 +69,11 @@ jobs:
6769
fail-fast: false
6870
matrix:
6971
os-image:
70-
- ubuntu-22.04
72+
- ubuntu-24.04
7173
- windows-2022
7274
- macos-14
7375
vcpkg-version:
74-
- 2024.12.16
76+
- 2025.01.13 # https://github.com/microsoft/vcpkg/releases
7577
runs-on: ${{ matrix.os-image }}
7678
env:
7779
VCPKG_VERSION: ${{ matrix.vcpkg-version }}
@@ -102,8 +104,11 @@ jobs:
102104
- windows-2022
103105
version:
104106
- opencv: 3.4.16
105-
- opencv: 4.10.0
107+
- opencv: 4.11.0 # https://community.chocolatey.org/packages/OpenCV#versionhistory
106108
include:
109+
- os-image: ubuntu-24.04
110+
version:
111+
opencv: 4.6.0
107112
- os-image: ubuntu-22.04
108113
version:
109114
opencv: 4.5.4
@@ -133,7 +138,7 @@ jobs:
133138
shell: bash
134139

135140
docs-rs:
136-
runs-on: ubuntu-22.04
141+
runs-on: ubuntu-24.04
137142
steps:
138143
- uses: actions/checkout@v4
139144
- uses: dtolnay/rust-toolchain@stable
@@ -143,7 +148,7 @@ jobs:
143148
shell: bash
144149

145150
msrv:
146-
runs-on: ubuntu-20.04
151+
runs-on: ubuntu-24.04
147152
env:
148153
OPENCV_VERSION: 4.11.0
149154
SCCACHE_GHA_ENABLED: "true"
@@ -162,7 +167,7 @@ jobs:
162167
- uses: actions/cache@v4
163168
with:
164169
path: ~/build
165-
key: build-${{ env.OPENCV_VERSION }}-ubuntu-20.04
170+
key: build-${{ env.OPENCV_VERSION }}-dynamic-ubuntu-24.04
166171

167172
- name: Get MSRV package metadata
168173
id: metadata

‎ci/check.sh

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎ci/docs-rs.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,5 @@ set -xeu
55
sudo apt-get update
66
sudo apt-get install -y clang libclang-dev
77

8-
# workaround to make clang_sys crate detect installed libclang
9-
sudo ln -fs libclang.so.1 /usr/lib/llvm-14/lib/libclang.so
10-
118
export RUST_BACKTRACE=full DOCS_RS=1
129
cargo doc -vv

‎ci/install-ubuntu-vcpkg.sh

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,35 @@ if [[ "${VCPKG_VERSION:-}" == "" ]]; then
88
fi
99

1010
sudo apt-get update
11-
sudo apt-get install -y clang libharfbuzz0b git curl zip unzip tar bison gperf libx11-dev libxft-dev libxext-dev \
12-
libgles2-mesa-dev autoconf libtool build-essential libxrandr-dev libxi-dev libxcursor-dev libxdamage-dev libxinerama-dev \
13-
libdbus-1-dev libxtst-dev sudo python3-jinja2 cmake
14-
15-
# workaround to make clang_sys crate detect installed libclang
16-
sudo ln -fs libclang.so.1 /usr/lib/llvm-14/lib/libclang.so
11+
sudo apt-get install -y \
12+
autoconf \
13+
bison \
14+
build-essential \
15+
clang \
16+
cmake \
17+
curl \
18+
git \
19+
gperf \
20+
libclang-dev \
21+
libdbus-1-dev \
22+
libgles2-mesa-dev \
23+
libharfbuzz0b \
24+
libltdl-dev \
25+
libtool \
26+
libx11-dev \
27+
libxcursor-dev \
28+
libxdamage-dev \
29+
libxext-dev \
30+
libxft-dev \
31+
libxi-dev \
32+
libxinerama-dev \
33+
libxrandr-dev \
34+
libxtst-dev \
35+
python3-jinja2 \
36+
sudo \
37+
tar \
38+
unzip \
39+
zip
1740

1841
export VCPKG_ROOT="$HOME/build/vcpkg"
1942
export VCPKG_DISABLE_METRICS=1
@@ -38,7 +61,7 @@ export VCPKG_DEFAULT_TRIPLET=x64-linux
3861
which cmake
3962
cmake --version
4063
if ! ./vcpkg install --clean-after-build --recurse "opencv[contrib,nonfree,ade,opencl]"; then
41-
for log in "$VCPKG_ROOT/buildtrees"/**/*out.log; do
64+
for log in "$VCPKG_ROOT/buildtrees"/**/*-{out,err}.log; do
4265
echo "=== $log"
4366
cat "$log"
4467
done

‎ci/install-ubuntu.sh

Lines changed: 40 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,6 @@ ubuntu_version="$(cat /etc/os-release | sed -nr 's:^VERSION_ID="(.+?)":\1: p')"
88

99
sudo apt-get install -y clang libclang-dev
1010
case "$ubuntu_version" in
11-
"18.04")
12-
# workaround to make clang_sys crate detect installed libclang
13-
sudo ln -fs libclang.so.1 /usr/lib/llvm-6.0/lib/libclang.so
14-
;;
15-
1611
"20.04")
1712
# workaround to make clang_sys crate detect installed libclang
1813
sudo ln -fs libclang.so.1 /usr/lib/llvm-10/lib/libclang.so
@@ -30,6 +25,13 @@ case "$ubuntu_version" in
3025
exit 0
3126
fi
3227
;;
28+
29+
"24.04")
30+
if [[ "$OPENCV_VERSION" == "4.6.0" ]]; then
31+
sudo apt-get -y install "libopencv-dev=${OPENCV_VERSION}*"
32+
exit 0
33+
fi
34+
;;
3335
esac
3436

3537
BUILD_FLAGS="
@@ -136,7 +138,6 @@ BUILD_FLAGS="
136138
sudo apt-get -y install build-essential cmake
137139

138140
if [[ "${OPENCV_LINKAGE:-dynamic}" == "static" ]]; then # static build
139-
# bring back -D BUILD_TBB=ON when updated to Ubuntu-24.04 (https://github.com/opencv/opencv/issues/25187)
140141
BUILD_FLAGS="$BUILD_FLAGS
141142
-D BUILD_JPEG=ON
142143
-D BUILD_OPENJPEG=ON
@@ -160,7 +161,7 @@ if [[ "${OPENCV_LINKAGE:-dynamic}" == "static" ]]; then # static build
160161
"
161162
else # dynamic build
162163
case "$ubuntu_version" in
163-
"18.04" | "20.04")
164+
"20.04")
164165
sudo apt-get -y install \
165166
libatlas-base-dev \
166167
libavcodec-dev \
@@ -256,6 +257,38 @@ else # dynamic build
256257
libwebp-dev \
257258
qtbase5-dev
258259
;;
260+
261+
"24.04")
262+
# runtime deps
263+
sudo apt-get -y install \
264+
libatlas-base-dev \
265+
libavcodec-dev \
266+
libavformat-dev \
267+
libceres-dev \
268+
libdc1394-dev \
269+
libeigen3-dev \
270+
libfreetype6-dev \
271+
libgdal-dev \
272+
libgflags-dev \
273+
libgoogle-glog-dev \
274+
libgphoto2-dev \
275+
libgstreamer-plugins-base1.0-dev \
276+
libharfbuzz-dev \
277+
libhdf5-dev \
278+
libjpeg-dev \
279+
liblapacke64-dev \
280+
libleptonica-dev \
281+
libopenexr-dev \
282+
libpng-dev \
283+
libswscale-dev \
284+
libtbb-dev \
285+
libtesseract-dev \
286+
libtiff-dev \
287+
libunwind-dev \
288+
libvtk9-dev \
289+
libwebp-dev \
290+
qtbase5-dev
291+
;;
259292
esac
260293
fi
261294

‎ci/install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ elif [[ "$os_family" == "macOS" ]]; then
4040
"$ci_dir/install-macos-framework.sh"
4141
fi
4242
elif [[ "$os_family" == "Windows" ]]; then
43-
export CHOCO_LLVM_VERSION=19.1.5
43+
export CHOCO_LLVM_VERSION=19.1.5 # https://community.chocolatey.org/packages/llvm#versionhistory
4444
if [[ "${VCPKG_VERSION:-}" != "" ]]; then # vcpkg build
4545
"$ci_dir/install-windows-vcpkg.sh"
4646
else # chocolatey build

0 commit comments

Comments
 (0)