Skip to content

Commit 8d63415

Browse files
shimatshimat
authored
Merge pull request #1800 from shimat/4.13.0
4.13.0
2 parents bfda318 + 7b1a53d commit 8d63415

File tree

155 files changed

+554
-468
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

155 files changed

+554
-468
lines changed

‎.github/docker-appengine.yml‎

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

‎.github/workflows/docfx.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ jobs:
1313

1414
steps:
1515
- name: Checkout
16-
uses: actions/checkout@v4
16+
uses: actions/checkout@v6
1717
with:
1818
fetch-depth: 1
1919

2020
- name: Install .NET
21-
uses: actions/setup-dotnet@v3
21+
uses: actions/setup-dotnet@v5
2222
with:
2323
dotnet-version: 8.0.x
2424

‎.github/workflows/docker-deploy.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99

1010
env:
1111
DEBIAN_FRONTEND: noninteractive
12-
DOCKER_IMAGE_NAME1: "ubuntu24-dotnet8-opencv4.12.0"
12+
DOCKER_IMAGE_NAME1: "ubuntu24-dotnet10-opencv4.13.0"
1313

1414
jobs:
1515
build:
@@ -27,7 +27,7 @@ jobs:
2727
exit 1
2828
fi
2929
30-
- uses: actions/checkout@v4
30+
- uses: actions/checkout@v6
3131
with:
3232
fetch-depth: 1
3333

‎.github/workflows/docker-test-ubuntu.yml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: Docker Test
2+
3+
on:
4+
pull_request:
5+
types: [synchronize, opened]
6+
7+
env:
8+
DEBIAN_FRONTEND: noninteractive
9+
OPENCV_VERSION: 4.13.0
10+
DOCKER_BUILD_CONTEXT: ./docker/ubuntu24-dotnet10-opencv4.13.0
11+
12+
jobs:
13+
build:
14+
runs-on: ubuntu-latest
15+
timeout-minutes: 60
16+
17+
steps:
18+
- uses: actions/checkout@v6
19+
20+
- uses: docker/setup-buildx-action@v3
21+
22+
- name: Build with Docker
23+
uses: docker/build-push-action@v6
24+
with:
25+
context: ${{ env.DOCKER_BUILD_CONTEXT }}
26+
build-args: |
27+
OPENCV_VERSION=${{ env.OPENCV_VERSION }}
28+
OPENCVSHARP_REF=${{ github.head_ref || github.ref_name }}
29+
outputs: type=docker,name=shimat/ubuntu24-dotnet10-opencv4.13.0:latest
30+
cache-from: |
31+
type=gha,scope=${{ github.ref_name }}
32+
type=gha,scope=main
33+
cache-to: type=gha,mode=max,scope=${{ github.ref_name }}

‎.github/workflows/docker-ubuntu.yml‎

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

‎.github/workflows/linux-arm.yml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Linux ARM (Docker)
1+
name: Linux ARM
22

33
on:
44
pull_request:
@@ -9,36 +9,36 @@ on:
99

1010
env:
1111
DEBIAN_FRONTEND: noninteractive
12-
OPENCV_VERSION: 4.12.0
12+
OPENCV_VERSION: 4.13.0
13+
DOCKER_BUILD_CONTEXT: ./docker/ubuntu24-dotnet10-opencv4.13.0
1314

1415
jobs:
1516
build:
16-
runs-on: ubuntu-latest
17+
runs-on: ubuntu-24.04-arm
1718
steps:
18-
- uses: actions/checkout@v4
19-
20-
- uses: docker/setup-qemu-action@v3
19+
- uses: actions/checkout@v6
2120

2221
- uses: docker/setup-buildx-action@v3
23-
with:
24-
install: true
2522

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

3939
- name: Extract build files from Docker instance
4040
run: |
41-
docker create -ti --name opencvsharp-linux-arm-tmp opencvsharp-linux-arm bash
41+
docker create -ti --name opencvsharp-linux-arm-tmp opencvsharp-linux-arm:latest bash
4242
docker cp opencvsharp-linux-arm-tmp:/artifacts .
4343
4444
- name: Patch nuspec with version and build NuGet package

‎.github/workflows/macos10.yml.disabled‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: macos-11
1818

1919
steps:
20-
- uses: actions/checkout@v3
20+
- uses: actions/checkout@v6
2121
with:
2222
fetch-depth: 1
2323

@@ -27,7 +27,7 @@ jobs:
2727

2828
# - name: Cache OpenCV
2929
# id: opencv-cache
30-
# uses: actions/cache@v3
30+
# uses: actions/cache@v5
3131
# with:
3232
# path: ${{ github.workspace }}/opencv_macos/
3333
# key: opencv-${{ env.OPENCV_VERSION }}-macos-rev1
@@ -104,7 +104,7 @@ jobs:
104104
LD_LIBRARY_PATH=. ./test
105105

106106
- name: Install .NET
107-
uses: actions/setup-dotnet@v3
107+
uses: actions/setup-dotnet@v5
108108
with:
109109
dotnet-version: '6.0.x'
110110

@@ -128,14 +128,14 @@ jobs:
128128
run: |
129129
cd ${GITHUB_WORKSPACE}/test/OpenCvSharp.Tests
130130
# ls
131-
dotnet build -c Release -f net6.0
132-
cp ${GITHUB_WORKSPACE}/nuget/libOpenCvSharpExtern.dylib ${GITHUB_WORKSPACE}/test/OpenCvSharp.Tests/bin/Release/net6.0/
131+
dotnet build -c Release -f net8.0
132+
cp ${GITHUB_WORKSPACE}/nuget/libOpenCvSharpExtern.dylib ${GITHUB_WORKSPACE}/test/OpenCvSharp.Tests/bin/Release/net8.0/
133133
cp ${GITHUB_WORKSPACE}/nuget/libOpenCvSharpExtern.dylib ${GITHUB_WORKSPACE}/test/OpenCvSharp.Tests/
134-
# ls ${GITHUB_WORKSPACE}/test/OpenCvSharp.Tests/bin/Release/net6.0/
134+
# ls ${GITHUB_WORKSPACE}/test/OpenCvSharp.Tests/bin/Release/net8.0/
135135
# ls
136136
sudo cp ${GITHUB_WORKSPACE}/nuget/libOpenCvSharpExtern.dylib /usr/local/lib/
137137
LD_LIBRARY_PATH=.
138-
dotnet test OpenCvSharp.Tests.csproj -c Release -f net6.0 --runtime osx-x64 --logger "trx;LogFileName=test-results.trx" < /dev/null
138+
dotnet test OpenCvSharp.Tests.csproj -c Release -f net8.0 --runtime osx-x64 --logger "trx;LogFileName=test-results.trx" < /dev/null
139139
ls
140140
ls TestResults
141141

‎.github/workflows/publish_nuget.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ on:
55

66
jobs:
77
Publish:
8-
runs-on: ubuntu-22.04
8+
runs-on: ubuntu-24.04
99

1010
steps:
11-
- uses: actions/checkout@v4
11+
- uses: actions/checkout@v6
1212

1313
- name: Download windows artifact
1414
uses: dawidd6/action-download-artifact@v6
@@ -49,7 +49,7 @@ jobs:
4949
ls -l
5050
5151
- name: Install .NET
52-
uses: actions/setup-dotnet@v4
52+
uses: actions/setup-dotnet@v5
5353
with:
5454
dotnet-version: 8.0.x
5555

‎.github/workflows/ubuntu22.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99

1010
env:
1111
DEBIAN_FRONTEND: noninteractive
12-
OPENCV_VERSION: 4.11.0
12+
OPENCV_VERSION: 4.13.0
1313
OPENCV_CACHE_VERSION: 1
1414

1515
jobs:
@@ -18,7 +18,7 @@ jobs:
1818
runs-on: ubuntu-22.04
1919

2020
steps:
21-
- uses: actions/checkout@v4
21+
- uses: actions/checkout@v6
2222
with:
2323
path: opencvsharp
2424

@@ -51,21 +51,21 @@ jobs:
5151
5252
- name: Cache OpenCV
5353
id: opencv-cache
54-
uses: actions/cache@v4
54+
uses: actions/cache@v5
5555
with:
5656
path: ${{ github.workspace }}/opencv_artifacts/
5757
key: opencv-${{ env.OPENCV_VERSION }}-rev${{ env.OPENCV_CACHE_VERSION }}
5858

5959
- name: Checkout OpenCV
6060
if: steps.opencv-cache.outputs.cache-hit != 'true'
61-
uses: actions/checkout@v4
61+
uses: actions/checkout@v6
6262
with:
6363
repository: opencv/opencv
6464
path: opencv
6565
ref: ${{ env.OPENCV_VERSION }}
6666
- name: Checkout OpenCV Contrib
6767
if: steps.opencv-cache.outputs.cache-hit != 'true'
68-
uses: actions/checkout@v4
68+
uses: actions/checkout@v6
6969
with:
7070
repository: opencv/opencv_contrib
7171
path: opencv_contrib
@@ -125,7 +125,7 @@ jobs:
125125
- name: Build OpenCvSharpExtern
126126
run: |
127127
mkdir opencvsharp/src/build && cd $_
128-
cmake -D CMAKE_PREFIX_PATH=${GITHUB_WORKSPACE}/opencv_artifacts ..
128+
cmake -D CMAKE_BUILD_TYPE=Release -D CMAKE_PREFIX_PATH=${GITHUB_WORKSPACE}/opencv_artifacts ..
129129
make -j
130130
ls OpenCvSharpExtern
131131
cp OpenCvSharpExtern/libOpenCvSharpExtern.so ${GITHUB_WORKSPACE}/opencvsharp/nuget/
@@ -140,7 +140,7 @@ jobs:
140140
LD_LIBRARY_PATH=. ./test
141141
142142
- name: Install .NET
143-
uses: actions/setup-dotnet@v4
143+
uses: actions/setup-dotnet@v5
144144
with:
145145
dotnet-version: '8.0.x'
146146

‎.github/workflows/wasm.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99

1010
env:
1111
DEBIAN_FRONTEND: noninteractive
12-
OPENCV_VERSION: 4.11.0
12+
OPENCV_VERSION: 4.13.0
1313
EM_VERSION: 3.1.32
1414
EM_CACHE_FOLDER: 'emsdk-cache'
1515

@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ubuntu-22.04
2020

2121
steps:
22-
- uses: actions/checkout@v4
22+
- uses: actions/checkout@v6
2323
with:
2424
fetch-depth: 1
2525

@@ -57,14 +57,14 @@ jobs:
5757
5858
- name: Cache OpenCV
5959
id: opencv-cache
60-
uses: actions/cache@v4
60+
uses: actions/cache@v5
6161
with:
6262
path: ${{ github.workspace }}/opencv_wasm/
6363
key: opencv-${{ env.OPENCV_VERSION }}-wasm
6464

6565
- name: Setup Emscripten cache
6666
id: cache-system-libraries
67-
uses: actions/cache@v4
67+
uses: actions/cache@v5
6868
with:
6969
path: ${{env.EM_CACHE_FOLDER}}
7070
key: ${{env.EM_VERSION}}-${{ runner.os }}
@@ -151,7 +151,7 @@ jobs:
151151
echo TODO
152152
153153
- name: Install .NET
154-
uses: actions/setup-dotnet@v4
154+
uses: actions/setup-dotnet@v5
155155
with:
156156
dotnet-version: '8.0.x'
157157

0 commit comments

Comments
 (0)