Skip to content

Commit d483e90

Browse files
authored
Merge pull request #1739 from shimat/update_gha_3rdparty_actions
Update third-party actions
2 parents ba99453 + 54a9603 commit d483e90

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

.github/workflows/linux-arm.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ jobs:
1515
build:
1616
runs-on: ubuntu-22.04
1717
steps:
18-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v4
1919

20-
- uses: docker/setup-buildx-action@v2
20+
- uses: docker/setup-buildx-action@v3
2121
with:
2222
install: true
2323

24-
- uses: docker/setup-qemu-action@v2
24+
- uses: docker/setup-qemu-action@v3
2525

2626
- name: Build with Docker
2727
run: |
@@ -44,7 +44,7 @@ jobs:
4444
cp artifacts/libOpenCvSharpExtern.so nuget/
4545
dotnet pack nuget/OpenCvSharp4.runtime.linux-arm.csproj -o artifacts_arm
4646
47-
- uses: actions/upload-artifact@v3
47+
- uses: actions/upload-artifact@v4
4848
with:
4949
name: artifacts_linux_arm
5050
path: artifacts_arm

.github/workflows/publish_nuget.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ubuntu-22.04
99

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

1313
- name: Download windows artifact
1414
uses: dawidd6/action-download-artifact@v6
@@ -18,14 +18,14 @@ jobs:
1818
name: packages_windows
1919

2020
- name: Download ubuntu artifact
21-
uses: dawidd6/action-download-artifact@v6
21+
uses: dawidd6/action-download-artifact@v8
2222
with:
2323
github_token: ${{secrets.GITHUB_TOKEN}}
2424
workflow: ubuntu22.yml
2525
name: artifacts_ubuntu_22
2626

2727
- name: Download ubuntu arm artifact
28-
uses: dawidd6/action-download-artifact@v6
28+
uses: dawidd6/action-download-artifact@v8
2929
with:
3030
github_token: ${{secrets.GITHUB_TOKEN}}
3131
workflow: linux-arm.yml
@@ -39,7 +39,7 @@ jobs:
3939
# name: artifacts_macos_10
4040

4141
- name: Download wasm artifact
42-
uses: dawidd6/action-download-artifact@v6
42+
uses: dawidd6/action-download-artifact@v8
4343
with:
4444
github_token: ${{secrets.GITHUB_TOKEN}}
4545
workflow: wasm.yml

.github/workflows/ubuntu22.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ jobs:
114114
-D WITH_ADE=OFF \
115115
-D OPENCV_ENABLE_NONFREE=ON \
116116
-D CMAKE_INSTALL_PREFIX=${GITHUB_WORKSPACE}/opencv_artifacts ..
117-
make -j2
117+
make -j
118118
make install
119119
sudo ldconfig
120120
cd ${GITHUB_WORKSPACE}
@@ -124,7 +124,7 @@ jobs:
124124
run: |
125125
mkdir opencvsharp/src/build && cd $_
126126
cmake -D CMAKE_PREFIX_PATH=${GITHUB_WORKSPACE}/opencv_artifacts ..
127-
make -j2
127+
make -j
128128
ls OpenCvSharpExtern
129129
cp OpenCvSharpExtern/libOpenCvSharpExtern.so ${GITHUB_WORKSPACE}/opencvsharp/nuget/
130130

.github/workflows/wasm.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ubuntu-22.04
2020

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

@@ -57,18 +57,18 @@ jobs:
5757
5858
- name: Cache OpenCV
5959
id: opencv-cache
60-
uses: actions/cache@v3
60+
uses: actions/cache@v4
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@v3
67+
uses: actions/cache@v4
6868
with:
6969
path: ${{env.EM_CACHE_FOLDER}}
7070
key: ${{env.EM_VERSION}}-${{ runner.os }}
71-
- uses: mymindstorm/setup-emsdk@v10
71+
- uses: mymindstorm/setup-emsdk@v14
7272
with:
7373
version: ${{env.EM_VERSION}}
7474
actions-cache-folder: ${{env.EM_CACHE_FOLDER}}
@@ -128,7 +128,7 @@ jobs:
128128
-DCV_ENABLE_INTRINSICS=OFF \
129129
-DBUILD_opencv_dnn=ON \
130130
..
131-
make -j2
131+
make -j
132132
make install
133133
em++ -r -o ${GITHUB_WORKSPACE}/opencv_wasm/libopencv.o \
134134
-Wl,--whole-archive ${GITHUB_WORKSPACE}/opencv_wasm/lib/*.a \
@@ -142,7 +142,7 @@ jobs:
142142
echo "-----"
143143
mkdir src/build && cd $_
144144
emcmake cmake -DCMAKE_BUILD_TYPE=Release -DOpenCV_DIR=${GITHUB_WORKSPACE}/opencv_wasm/lib/cmake/opencv4 -DWASM_LIB=${GITHUB_WORKSPACE}/opencv_wasm/libopencv.o ..
145-
make -j2
145+
make -j
146146
ls OpenCvSharpExtern
147147
cp OpenCvSharpExtern/libOpenCvSharpExtern.a ${GITHUB_WORKSPACE}/nuget/
148148
@@ -151,9 +151,9 @@ jobs:
151151
echo TODO
152152
153153
- name: Install .NET
154-
uses: actions/setup-dotnet@v3
154+
uses: actions/setup-dotnet@v4
155155
with:
156-
dotnet-version: '6.0.x'
156+
dotnet-version: '8.0.x'
157157

158158
- name: Create NuGet package
159159
env:
@@ -166,7 +166,7 @@ jobs:
166166
dotnet pack ${GITHUB_WORKSPACE}/nuget/OpenCvSharp4.runtime.wasm.csproj -o ${GITHUB_WORKSPACE}/artifacts_wasm
167167
ls ${GITHUB_WORKSPACE}/artifacts_wasm
168168
169-
- uses: actions/upload-artifact@v3
169+
- uses: actions/upload-artifact@v4
170170
with:
171171
name: artifacts_wasm
172172
path: artifacts_wasm

0 commit comments

Comments
 (0)