Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/docker-static-opencv.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ jobs:
uses: docker/metadata-action@v5
with:
images: |
gocv/opencv:4.11.0-alpine-ffmpeg-gstreamer
ghcr.io/${{ github.repository_owner }}/opencv:4.11.0-alpine-ffmpeg-gstreamer
gocv/opencv:4.12.0-alpine-ffmpeg-gstreamer
ghcr.io/${{ github.repository_owner }}/opencv:4.12.0-alpine-ffmpeg-gstreamer
tags: |
type=sha,format=long
type=raw,value=latest
Expand All @@ -53,8 +53,8 @@ jobs:
context: .
push: true
tags: |
gocv/opencv:4.11.0-alpine-ffmpeg-gstreamer
ghcr.io/${{ github.repository_owner }}/opencv:4.11.0-alpine-ffmpeg-gstreamer
gocv/opencv:4.12.0-alpine-ffmpeg-gstreamer
ghcr.io/${{ github.repository_owner }}/opencv:4.12.0-alpine-ffmpeg-gstreamer
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha
cache-to: type=gha,mode=max
76 changes: 38 additions & 38 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
with:
image: tonistiigi/binfmt:qemu-v7.0.0-28
image: tonistiigi/binfmt:latest
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Check out the repo
Expand All @@ -62,8 +62,8 @@ jobs:
uses: docker/metadata-action@v5
with:
images: |
gocv/opencv:4.11.0
ghcr.io/${{ github.repository_owner }}/opencv:4.11.0
gocv/opencv:4.12.0
ghcr.io/${{ github.repository_owner }}/opencv:4.12.0
tags: |
type=sha,format=long
type=raw,value=latest
Expand All @@ -87,9 +87,9 @@ jobs:
push: true
tags: |
gocv/opencv:latest
gocv/opencv:4.11.0
gocv/opencv:4.12.0
ghcr.io/${{ github.repository_owner }}/opencv:latest
ghcr.io/${{ github.repository_owner }}/opencv:4.11.0
ghcr.io/${{ github.repository_owner }}/opencv:4.12.0
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha
cache-to: type=gha,mode=max
Expand Down Expand Up @@ -136,7 +136,7 @@ jobs:
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
with:
image: tonistiigi/binfmt:qemu-v7.0.0-28
image: tonistiigi/binfmt:latest
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Check out the repo
Expand All @@ -146,8 +146,8 @@ jobs:
uses: docker/metadata-action@v5
with:
images: |
gocv/opencv:4.11.0-static
ghcr.io/${{ github.repository_owner }}/opencv:4.11.0-static
gocv/opencv:4.12.0-static
ghcr.io/${{ github.repository_owner }}/opencv:4.12.0-static
tags: |
type=sha,format=long
type=raw,value=latest
Expand All @@ -170,8 +170,8 @@ jobs:
context: .
push: true
tags: |
gocv/opencv:4.11.0-static
ghcr.io/${{ github.repository_owner }}/opencv:4.11.0-static
gocv/opencv:4.12.0-static
ghcr.io/${{ github.repository_owner }}/opencv:4.12.0-static
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha
cache-to: type=gha,mode=max
Expand Down Expand Up @@ -224,8 +224,8 @@ jobs:
uses: docker/metadata-action@v5
with:
images: |
gocv/opencv:4.11.0-gpu-cuda-11
ghcr.io/${{ github.repository_owner }}/opencv:4.11.0-gpu-cuda-11
gocv/opencv:4.12.0-gpu-cuda-11
ghcr.io/${{ github.repository_owner }}/opencv:4.12.0-gpu-cuda-11
tags: |
type=sha,format=long
type=raw,value=latest
Expand All @@ -248,8 +248,8 @@ jobs:
context: .
push: true
tags: |
gocv/opencv:4.11.0-gpu-cuda-11
ghcr.io/${{ github.repository_owner }}/opencv:4.11.0-gpu-cuda-11
gocv/opencv:4.12.0-gpu-cuda-11
ghcr.io/${{ github.repository_owner }}/opencv:4.12.0-gpu-cuda-11
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha
cache-to: type=gha,mode=max
Expand Down Expand Up @@ -302,8 +302,8 @@ jobs:
uses: docker/metadata-action@v5
with:
images: |
gocv/opencv:4.11.0-gpu-cuda-11.2.2
ghcr.io/${{ github.repository_owner }}/opencv:4.11.0-gpu-cuda-11.2.2
gocv/opencv:4.12.0-gpu-cuda-11.2.2
ghcr.io/${{ github.repository_owner }}/opencv:4.12.0-gpu-cuda-11.2.2
tags: |
type=sha,format=long
type=raw,value=latest
Expand All @@ -326,8 +326,8 @@ jobs:
context: .
push: true
tags: |
gocv/opencv:4.11.0-gpu-cuda-11.2.2
ghcr.io/${{ github.repository_owner }}/opencv:4.11.0-gpu-cuda-11.2.2
gocv/opencv:4.12.0-gpu-cuda-11.2.2
ghcr.io/${{ github.repository_owner }}/opencv:4.12.0-gpu-cuda-11.2.2
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha
cache-to: type=gha,mode=max
Expand Down Expand Up @@ -380,8 +380,8 @@ jobs:
uses: docker/metadata-action@v5
with:
images: |
gocv/opencv:4.11.0-gpu-cuda-12
ghcr.io/${{ github.repository_owner }}/opemcv:4.11.0-gpu-cuda-12
gocv/opencv:4.12.0-gpu-cuda-12
ghcr.io/${{ github.repository_owner }}/opemcv:4.12.0-gpu-cuda-12
tags: |
type=sha,format=long
type=raw,value=latest
Expand All @@ -404,8 +404,8 @@ jobs:
context: .
push: true
tags: |
gocv/opencv:4.11.0-gpu-cuda-12
ghcr.io/${{ github.repository_owner }}/opencv:4.11.0-gpu-cuda-12
gocv/opencv:4.12.0-gpu-cuda-12
ghcr.io/${{ github.repository_owner }}/opencv:4.12.0-gpu-cuda-12
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha
cache-to: type=gha,mode=max
Expand All @@ -426,8 +426,8 @@ jobs:
uses: docker/metadata-action@v5
with:
images: |
gocv/opencv:4.11.0-ubuntu-18.04
ghcr.io/${{ github.repository_owner }}/opencv:4.11.0-ubuntu-18.04
gocv/opencv:4.12.0-ubuntu-18.04
ghcr.io/${{ github.repository_owner }}/opencv:4.12.0-ubuntu-18.04
tags: |
type=sha,format=long
type=raw,value=latest
Expand All @@ -450,8 +450,8 @@ jobs:
context: .
push: true
tags: |
gocv/opencv:4.11.0-ubuntu-18.04
ghcr.io/${{ github.repository_owner }}/opencv:4.11.0-ubuntu-18.04
gocv/opencv:4.12.0-ubuntu-18.04
ghcr.io/${{ github.repository_owner }}/opencv:4.12.0-ubuntu-18.04
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha
cache-to: type=gha,mode=max
Expand All @@ -472,8 +472,8 @@ jobs:
uses: docker/metadata-action@v5
with:
images: |
gocv/opencv:4.11.0-ubuntu-20.04
ghcr.io/${{ github.repository_owner }}/opencv:4.11.0-ubuntu-20.04
gocv/opencv:4.12.0-ubuntu-20.04
ghcr.io/${{ github.repository_owner }}/opencv:4.12.0-ubuntu-20.04
tags: |
type=sha,format=long
type=raw,value=latest
Expand All @@ -496,8 +496,8 @@ jobs:
context: .
push: true
tags: |
gocv/opencv:4.11.0-ubuntu-20.04
ghcr.io/${{ github.repository_owner }}/opencv:4.11.0-ubuntu-20.04
gocv/opencv:4.12.0-ubuntu-20.04
ghcr.io/${{ github.repository_owner }}/opencv:4.12.0-ubuntu-20.04
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha
cache-to: type=gha,mode=max
Expand All @@ -518,8 +518,8 @@ jobs:
uses: docker/metadata-action@v5
with:
images: |
gocv/opencv:4.11.0-ubuntu-22.04
ghcr.io/${{ github.repository_owner }}/opencv:4.11.0-ubuntu-22.04
gocv/opencv:4.12.0-ubuntu-22.04
ghcr.io/${{ github.repository_owner }}/opencv:4.12.0-ubuntu-22.04
tags: |
type=sha,format=long
type=raw,value=latest
Expand All @@ -542,8 +542,8 @@ jobs:
context: .
push: true
tags: |
gocv/opencv:4.11.0-ubuntu-22.04
ghcr.io/${{ github.repository_owner }}/opencv:4.11.0-ubuntu-22.04
gocv/opencv:4.12.0-ubuntu-22.04
ghcr.io/${{ github.repository_owner }}/opencv:4.12.0-ubuntu-22.04
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha
cache-to: type=gha,mode=max
Expand All @@ -564,8 +564,8 @@ jobs:
uses: docker/metadata-action@v5
with:
images: |
gocv/opencv:4.11.0-ubuntu-24.04
ghcr.io/${{ github.repository_owner }}/opencv:4.11.0-ubuntu-24.04
gocv/opencv:4.12.0-ubuntu-24.04
ghcr.io/${{ github.repository_owner }}/opencv:4.12.0-ubuntu-24.04
tags: |
type=sha,format=long
type=raw,value=latest
Expand All @@ -588,8 +588,8 @@ jobs:
context: .
push: true
tags: |
gocv/opencv:4.11.0-ubuntu-24.04
ghcr.io/${{ github.repository_owner }}/opencv:4.11.0-ubuntu-24.04
gocv/opencv:4.12.0-ubuntu-24.04
ghcr.io/${{ github.repository_owner }}/opencv:4.12.0-ubuntu-24.04
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha
cache-to: type=gha,mode=max
2 changes: 1 addition & 1 deletion .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
jobs:
build:
runs-on: ubuntu-latest
container: ghcr.io/hybridgroup/opencv:4.11.0
container: ghcr.io/hybridgroup/opencv:4.12.0

steps:
- name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: '1.23'
go-version: '1.24'
cache: true
- name: Checkout
uses: actions/checkout@v4
Expand Down
32 changes: 16 additions & 16 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,53 +20,53 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: '1.22'
go-version: '1.24'
cache: true
- name: Restore cached OpenCV source
uses: actions/cache/restore@v4
id: cache-opencv-source
with:
key: opencv-source-4110-windows-v1a
key: opencv-source-4120-windows-v1a
path: |
./opencv/opencv-4.11.0
./opencv/opencv_contrib-4.11.0
./opencv/opencv-4.12.0
./opencv/opencv_contrib-4.12.0
- name: Download OpenCV source
if: steps.cache-opencv-source.outputs.cache-hit != 'true'
shell: bash
run: |
mkdir -p ./opencv
curl -Lo ./opencv/opencv-4.11.0.zip https://github.com/opencv/opencv/archive/4.11.0.zip
curl -Lo ./opencv/opencv_contrib-4.11.0.zip https://github.com/opencv/opencv_contrib/archive/4.11.0.zip
curl -Lo ./opencv/opencv-4.12.0.zip https://github.com/opencv/opencv/archive/4.12.0.zip
curl -Lo ./opencv/opencv_contrib-4.12.0.zip https://github.com/opencv/opencv_contrib/archive/4.12.0.zip
- name: Extract OpenCV source
if: steps.cache-opencv-source.outputs.cache-hit != 'true'
shell: bash
run: |
cd ./opencv
mkdir -p opencv-4.11.0
mkdir -p opencv_contrib-4.11.0
7z x opencv-4.11.0.zip
7z x opencv_contrib-4.11.0.zip
mkdir -p opencv-4.12.0
mkdir -p opencv_contrib-4.12.0
7z x opencv-4.12.0.zip
7z x opencv_contrib-4.12.0.zip
- name: Save cached OpenCV source
uses: actions/cache/save@v4
if: steps.cache-opencv-source.outputs.cache-hit != 'true'
with:
key: ${{ steps.cache-opencv-source.outputs.cache-primary-key }}
path: |
./opencv/opencv-4.11.0
./opencv/opencv_contrib-4.11.0
./opencv/opencv-4.12.0
./opencv/opencv_contrib-4.12.0
- name: Restore cached OpenCV build
uses: actions/cache/restore@v4
id: cache-opencv-build
with:
key: opencv-build-4110-windows-v1d
key: opencv-build-4120-windows-v1d
path: |
./opencv/build
- name: Build OpenCV
if: steps.cache-opencv-build.outputs.cache-hit != 'true'
run: |
mkdir -p ./opencv/build
cd ./opencv/build
cmake -G "MinGW Makefiles" -DENABLE_CXX11=ON -DOPENCV_EXTRA_MODULES_PATH="../opencv_contrib-4.11.0/modules" -DBUILD_SHARED_LIBS=ON -DWITH_IPP=OFF -DWITH_MSMF=OFF -DBUILD_EXAMPLES=OFF -DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=ON -DBUILD_opencv_java=OFF -DBUILD_opencv_python=OFF -DBUILD_opencv_python2=OFF -DBUILD_opencv_python3=OFF -DBUILD_DOCS=OFF -DENABLE_PRECOMPILED_HEADERS=OFF -DBUILD_opencv_saliency=OFF -DBUILD_opencv_wechat_qrcode=ON -DCPU_DISPATCH= -DOPENCV_GENERATE_PKGCONFIG=ON -DWITH_OPENCL_D3D11_NV=OFF -DOPENCV_ALLOCATOR_STATS_COUNTER_TYPE=int64_t -DOPENCV_ENABLE_NONFREE=ON -Wno-dev ../opencv-4.11.0
cmake -G "MinGW Makefiles" -DENABLE_CXX11=ON -DOPENCV_EXTRA_MODULES_PATH="../opencv_contrib-4.12.0/modules" -DBUILD_SHARED_LIBS=ON -DWITH_IPP=OFF -DWITH_MSMF=OFF -DBUILD_EXAMPLES=OFF -DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=ON -DBUILD_opencv_java=OFF -DBUILD_opencv_python=OFF -DBUILD_opencv_python2=OFF -DBUILD_opencv_python3=OFF -DBUILD_DOCS=OFF -DENABLE_PRECOMPILED_HEADERS=OFF -DBUILD_opencv_saliency=OFF -DBUILD_opencv_wechat_qrcode=ON -DCPU_DISPATCH= -DOPENCV_GENERATE_PKGCONFIG=ON -DWITH_OPENCL_D3D11_NV=OFF -DOPENCV_ALLOCATOR_STATS_COUNTER_TYPE=int64_t -DOPENCV_ENABLE_NONFREE=ON -Wno-dev ../opencv-4.12.0
cmake --build . --target install
- name: Save cached OpenCV build
uses: actions/cache/save@v4
Expand All @@ -78,9 +78,9 @@ jobs:
- name: Set GoCV env
run: |
go env
echo "CGO_CXXFLAGS=--std=c++11" >> $env:GITHUB_ENV
echo "CGO_CXXFLAGS=--std=c++11 -DNDEBUG" >> $env:GITHUB_ENV
echo "CGO_CPPFLAGS=-I${env:GITHUB_WORKSPACE}\opencv\build\install\include" >> $env:GITHUB_ENV
echo "CGO_LDFLAGS=-L${env:GITHUB_WORKSPACE}\opencv\build\install\x64\mingw\lib -lopencv_core4110 -lopencv_face4110 -lopencv_videoio4110 -lopencv_imgproc4110 -lopencv_highgui4110 -lopencv_imgcodecs4110 -lopencv_objdetect4110 -lopencv_features2d4110 -lopencv_video4110 -lopencv_dnn4110 -lopencv_xfeatures2d4110 -lopencv_plot4110 -lopencv_tracking4110 -lopencv_img_hash4110 -lopencv_calib3d4110 -lopencv_bgsegm4110 -lopencv_photo4110 -lopencv_aruco4110 -lopencv_wechat_qrcode4110 -lopencv_ximgproc4110 -lopencv_xphoto4110 -lopencv_xobjdetect4110" >> $env:GITHUB_ENV
echo "CGO_LDFLAGS=-L${env:GITHUB_WORKSPACE}\opencv\build\install\x64\mingw\lib -lopencv_core4120 -lopencv_face4120 -lopencv_videoio4120 -lopencv_imgproc4120 -lopencv_highgui4120 -lopencv_imgcodecs4120 -lopencv_objdetect4120 -lopencv_features2d4120 -lopencv_video4120 -lopencv_dnn4120 -lopencv_xfeatures2d4120 -lopencv_plot4120 -lopencv_tracking4120 -lopencv_img_hash4120 -lopencv_calib3d4120 -lopencv_bgsegm4120 -lopencv_photo4120 -lopencv_aruco4120 -lopencv_wechat_qrcode4120 -lopencv_ximgproc4120 -lopencv_xphoto4120 -lopencv_xobjdetect4120" >> $env:GITHUB_ENV
echo "${env:GITHUB_WORKSPACE}/opencv/build/install/x64/mingw/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
- name: Install Tensorflow test model
run: |
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# to build this docker image:
# docker build .
FROM ghcr.io/hybridgroup/opencv:4.11.0
FROM ghcr.io/hybridgroup/opencv:4.12.0

ENV GOPATH /go

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-static
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# to build this docker image:
# docker buildx build -f Dockerfile-static -t gocv-static --platform=linux/amd64,linux/arm64 .
#
FROM --platform=$BUILDPLATFORM ghcr.io/hybridgroup/opencv:4.11.0-static AS gocv-build
FROM --platform=$BUILDPLATFORM ghcr.io/hybridgroup/opencv:4.12.0-static AS gocv-build

ENV GOPATH /go

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-static-builder
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#
# NOTE that you cannot use highgui from the static build!
#
FROM --platform=$BUILDPLATFORM ghcr.io/hybridgroup/opencv:4.11.0-static AS gocv-static-builder
FROM --platform=$BUILDPLATFORM ghcr.io/hybridgroup/opencv:4.12.0-static AS gocv-static-builder

WORKDIR /src

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-test
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# docker run -it --rm -e DISPLAY=$DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix gocv-test-4.x
# xhost -
#
FROM ghcr.io/hybridgroup/opencv:4.11.0 AS gocv-test-4.11
FROM ghcr.io/hybridgroup/opencv:4.12.0 AS gocv-test-4.11

ENV GOPATH /go

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-test.gpu-cuda-10
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# To run tests:
# docker run -it --rm --gpus all gocv-test-gpu-cuda-10
#
FROM ghcr.io/hybridgroup/opencv:4.11.0-gpu-cuda-10 AS gocv-gpu-test-cuda-10
FROM ghcr.io/hybridgroup/opencv:4.12.0-gpu-cuda-10 AS gocv-gpu-test-cuda-10

ENV GOPATH /go
ENV PATH="${PATH}:/go/bin"
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-test.gpu-cuda-11
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# To run tests:
# docker run -it --rm --gpus all gocv-test-gpu-cuda-11
#
FROM ghcr.io/hybridgroup/opencv:4.11.0-gpu-cuda-11 AS gocv-gpu-test-cuda-11
FROM ghcr.io/hybridgroup/opencv:4.12.0-gpu-cuda-11 AS gocv-gpu-test-cuda-11

ENV GOPATH /go
ENV PATH="${PATH}:/go/bin"
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-test.gpu-cuda-11.2.2
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# To run tests:
# docker run -it --rm --gpus all gocv-test-gpu-cuda-11.2.2
#
FROM ghcr.io/hybridgroup/opencv:4.11.0-gpu-cuda-11.2.2 AS gocv-gpu-test-cuda-11
FROM ghcr.io/hybridgroup/opencv:4.12.0-gpu-cuda-11.2.2 AS gocv-gpu-test-cuda-11

ENV GOPATH /go
ENV PATH="${PATH}:/go/bin"
Expand Down
Loading
Loading