Skip to content
Merged

4.13.0 #1800

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
23 changes: 0 additions & 23 deletions .github/docker-appengine.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/docfx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
fetch-depth: 1

- name: Install .NET
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v5
with:
dotnet-version: 8.0.x

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docker-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:

env:
DEBIAN_FRONTEND: noninteractive
DOCKER_IMAGE_NAME1: "ubuntu24-dotnet8-opencv4.12.0"
DOCKER_IMAGE_NAME1: "ubuntu24-dotnet10-opencv4.13.0"

jobs:
build:
Expand All @@ -27,7 +27,7 @@ jobs:
exit 1
fi

- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
fetch-depth: 1

Expand Down
33 changes: 33 additions & 0 deletions .github/workflows/docker-test-ubuntu.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: Docker Test

on:
pull_request:
types: [synchronize, opened]

env:
DEBIAN_FRONTEND: noninteractive
OPENCV_VERSION: 4.13.0
DOCKER_BUILD_CONTEXT: ./docker/ubuntu24-dotnet10-opencv4.13.0

jobs:
build:
runs-on: ubuntu-latest
timeout-minutes: 60

steps:
- uses: actions/checkout@v6

- uses: docker/setup-buildx-action@v3

- name: Build with Docker
uses: docker/build-push-action@v6
with:
context: ${{ env.DOCKER_BUILD_CONTEXT }}
build-args: |
OPENCV_VERSION=${{ env.OPENCV_VERSION }}
OPENCVSHARP_REF=${{ github.head_ref || github.ref_name }}
outputs: type=docker,name=shimat/ubuntu24-dotnet10-opencv4.13.0:latest
cache-from: |
type=gha,scope=${{ github.ref_name }}
type=gha,scope=main
cache-to: type=gha,mode=max,scope=${{ github.ref_name }}
21 changes: 0 additions & 21 deletions .github/workflows/docker-ubuntu.yml

This file was deleted.

30 changes: 15 additions & 15 deletions .github/workflows/linux-arm.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Linux ARM (Docker)
name: Linux ARM

on:
pull_request:
Expand All @@ -9,36 +9,36 @@ on:

env:
DEBIAN_FRONTEND: noninteractive
OPENCV_VERSION: 4.12.0
OPENCV_VERSION: 4.13.0
DOCKER_BUILD_CONTEXT: ./docker/ubuntu24-dotnet10-opencv4.13.0

jobs:
build:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04-arm
steps:
- uses: actions/checkout@v4

- uses: docker/setup-qemu-action@v3
- uses: actions/checkout@v6

- uses: docker/setup-buildx-action@v3
with:
install: true

# Build with Buildx and cache Docker layers in GitHub Actions cache
- name: Build with Docker (cached)
- name: Build with Docker (native ARM64)
uses: docker/build-push-action@v6
with:
context: ./docker/ubuntu24-dotnet8-opencv4.12.0
platforms: linux/arm64
context: ${{ env.DOCKER_BUILD_CONTEXT }}
build-args: |
OPENCV_VERSION=${{ env.OPENCV_VERSION }}
# Load the built image to local Docker for later docker create/cp
OPENCVSHARP_REF=${{ github.head_ref || github.ref_name }}
outputs: type=docker,name=opencvsharp-linux-arm:latest
cache-from: type=gha
cache-to: type=gha,mode=max
# Use branch-specific cache keys to avoid using stale code from other branches
cache-from: |
type=gha,scope=${{ github.ref_name }}
type=gha,scope=main
# Save cache with branch-specific scope
cache-to: type=gha,mode=max,scope=${{ github.ref_name }}

- name: Extract build files from Docker instance
run: |
docker create -ti --name opencvsharp-linux-arm-tmp opencvsharp-linux-arm bash
docker create -ti --name opencvsharp-linux-arm-tmp opencvsharp-linux-arm:latest bash
docker cp opencvsharp-linux-arm-tmp:/artifacts .

- name: Patch nuspec with version and build NuGet package
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/macos10.yml.disabled
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
runs-on: macos-11

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v6
with:
fetch-depth: 1

Expand All @@ -27,7 +27,7 @@ jobs:

# - name: Cache OpenCV
# id: opencv-cache
# uses: actions/cache@v3
# uses: actions/cache@v5
# with:
# path: ${{ github.workspace }}/opencv_macos/
# key: opencv-${{ env.OPENCV_VERSION }}-macos-rev1
Expand Down Expand Up @@ -104,7 +104,7 @@ jobs:
LD_LIBRARY_PATH=. ./test

- name: Install .NET
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v5
with:
dotnet-version: '6.0.x'

Expand All @@ -128,14 +128,14 @@ jobs:
run: |
cd ${GITHUB_WORKSPACE}/test/OpenCvSharp.Tests
# ls
dotnet build -c Release -f net6.0
cp ${GITHUB_WORKSPACE}/nuget/libOpenCvSharpExtern.dylib ${GITHUB_WORKSPACE}/test/OpenCvSharp.Tests/bin/Release/net6.0/
dotnet build -c Release -f net8.0
cp ${GITHUB_WORKSPACE}/nuget/libOpenCvSharpExtern.dylib ${GITHUB_WORKSPACE}/test/OpenCvSharp.Tests/bin/Release/net8.0/
cp ${GITHUB_WORKSPACE}/nuget/libOpenCvSharpExtern.dylib ${GITHUB_WORKSPACE}/test/OpenCvSharp.Tests/
# ls ${GITHUB_WORKSPACE}/test/OpenCvSharp.Tests/bin/Release/net6.0/
# ls ${GITHUB_WORKSPACE}/test/OpenCvSharp.Tests/bin/Release/net8.0/
# ls
sudo cp ${GITHUB_WORKSPACE}/nuget/libOpenCvSharpExtern.dylib /usr/local/lib/
LD_LIBRARY_PATH=.
dotnet test OpenCvSharp.Tests.csproj -c Release -f net6.0 --runtime osx-x64 --logger "trx;LogFileName=test-results.trx" < /dev/null
dotnet test OpenCvSharp.Tests.csproj -c Release -f net8.0 --runtime osx-x64 --logger "trx;LogFileName=test-results.trx" < /dev/null
ls
ls TestResults

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publish_nuget.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ on:

jobs:
Publish:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- name: Download windows artifact
uses: dawidd6/action-download-artifact@v6
Expand Down Expand Up @@ -49,7 +49,7 @@ jobs:
ls -l

- name: Install .NET
uses: actions/setup-dotnet@v4
uses: actions/setup-dotnet@v5
with:
dotnet-version: 8.0.x

Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/ubuntu22.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:

env:
DEBIAN_FRONTEND: noninteractive
OPENCV_VERSION: 4.11.0
OPENCV_VERSION: 4.13.0
OPENCV_CACHE_VERSION: 1

jobs:
Expand All @@ -18,7 +18,7 @@ jobs:
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
path: opencvsharp

Expand Down Expand Up @@ -51,21 +51,21 @@ jobs:

- name: Cache OpenCV
id: opencv-cache
uses: actions/cache@v4
uses: actions/cache@v5
with:
path: ${{ github.workspace }}/opencv_artifacts/
key: opencv-${{ env.OPENCV_VERSION }}-rev${{ env.OPENCV_CACHE_VERSION }}

- name: Checkout OpenCV
if: steps.opencv-cache.outputs.cache-hit != 'true'
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
repository: opencv/opencv
path: opencv
ref: ${{ env.OPENCV_VERSION }}
- name: Checkout OpenCV Contrib
if: steps.opencv-cache.outputs.cache-hit != 'true'
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
repository: opencv/opencv_contrib
path: opencv_contrib
Expand Down Expand Up @@ -125,7 +125,7 @@ jobs:
- name: Build OpenCvSharpExtern
run: |
mkdir opencvsharp/src/build && cd $_
cmake -D CMAKE_PREFIX_PATH=${GITHUB_WORKSPACE}/opencv_artifacts ..
cmake -D CMAKE_BUILD_TYPE=Release -D CMAKE_PREFIX_PATH=${GITHUB_WORKSPACE}/opencv_artifacts ..
make -j
ls OpenCvSharpExtern
cp OpenCvSharpExtern/libOpenCvSharpExtern.so ${GITHUB_WORKSPACE}/opencvsharp/nuget/
Expand All @@ -140,7 +140,7 @@ jobs:
LD_LIBRARY_PATH=. ./test

- name: Install .NET
uses: actions/setup-dotnet@v4
uses: actions/setup-dotnet@v5
with:
dotnet-version: '8.0.x'

Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/wasm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:

env:
DEBIAN_FRONTEND: noninteractive
OPENCV_VERSION: 4.11.0
OPENCV_VERSION: 4.13.0
EM_VERSION: 3.1.32
EM_CACHE_FOLDER: 'emsdk-cache'

Expand All @@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
fetch-depth: 1

Expand Down Expand Up @@ -57,14 +57,14 @@ jobs:

- name: Cache OpenCV
id: opencv-cache
uses: actions/cache@v4
uses: actions/cache@v5
with:
path: ${{ github.workspace }}/opencv_wasm/
key: opencv-${{ env.OPENCV_VERSION }}-wasm

- name: Setup Emscripten cache
id: cache-system-libraries
uses: actions/cache@v4
uses: actions/cache@v5
with:
path: ${{env.EM_CACHE_FOLDER}}
key: ${{env.EM_VERSION}}-${{ runner.os }}
Expand Down Expand Up @@ -151,7 +151,7 @@ jobs:
echo TODO

- name: Install .NET
uses: actions/setup-dotnet@v4
uses: actions/setup-dotnet@v5
with:
dotnet-version: '8.0.x'

Expand Down
Loading
Loading