Skip to content

Commit

Permalink
Merge pull request #1739 from shimat/update_gha_3rdparty_actions
Browse files Browse the repository at this point in the history
Update third-party actions
  • Loading branch information
shimat authored Feb 9, 2025
2 parents ba99453 + 54a9603 commit d483e90
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 19 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/linux-arm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ jobs:
build:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

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

- uses: docker/setup-qemu-action@v2
- uses: docker/setup-qemu-action@v3

- name: Build with Docker
run: |
Expand All @@ -44,7 +44,7 @@ jobs:
cp artifacts/libOpenCvSharpExtern.so nuget/
dotnet pack nuget/OpenCvSharp4.runtime.linux-arm.csproj -o artifacts_arm
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: artifacts_linux_arm
path: artifacts_arm
8 changes: 4 additions & 4 deletions .github/workflows/publish_nuget.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-22.04

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

- name: Download windows artifact
uses: dawidd6/action-download-artifact@v6
Expand All @@ -18,14 +18,14 @@ jobs:
name: packages_windows

- name: Download ubuntu artifact
uses: dawidd6/action-download-artifact@v6
uses: dawidd6/action-download-artifact@v8
with:
github_token: ${{secrets.GITHUB_TOKEN}}
workflow: ubuntu22.yml
name: artifacts_ubuntu_22

- name: Download ubuntu arm artifact
uses: dawidd6/action-download-artifact@v6
uses: dawidd6/action-download-artifact@v8
with:
github_token: ${{secrets.GITHUB_TOKEN}}
workflow: linux-arm.yml
Expand All @@ -39,7 +39,7 @@ jobs:
# name: artifacts_macos_10

- name: Download wasm artifact
uses: dawidd6/action-download-artifact@v6
uses: dawidd6/action-download-artifact@v8
with:
github_token: ${{secrets.GITHUB_TOKEN}}
workflow: wasm.yml
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ubuntu22.yml
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ jobs:
-D WITH_ADE=OFF \
-D OPENCV_ENABLE_NONFREE=ON \
-D CMAKE_INSTALL_PREFIX=${GITHUB_WORKSPACE}/opencv_artifacts ..
make -j2
make -j
make install
sudo ldconfig
cd ${GITHUB_WORKSPACE}
Expand All @@ -124,7 +124,7 @@ jobs:
run: |
mkdir opencvsharp/src/build && cd $_
cmake -D CMAKE_PREFIX_PATH=${GITHUB_WORKSPACE}/opencv_artifacts ..
make -j2
make -j
ls OpenCvSharpExtern
cp OpenCvSharpExtern/libOpenCvSharpExtern.so ${GITHUB_WORKSPACE}/opencvsharp/nuget/
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/wasm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-22.04

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

Expand Down Expand Up @@ -57,18 +57,18 @@ jobs:
- name: Cache OpenCV
id: opencv-cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ${{ github.workspace }}/opencv_wasm/
key: opencv-${{ env.OPENCV_VERSION }}-wasm

- name: Setup Emscripten cache
id: cache-system-libraries
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ${{env.EM_CACHE_FOLDER}}
key: ${{env.EM_VERSION}}-${{ runner.os }}
- uses: mymindstorm/setup-emsdk@v10
- uses: mymindstorm/setup-emsdk@v14
with:
version: ${{env.EM_VERSION}}
actions-cache-folder: ${{env.EM_CACHE_FOLDER}}
Expand Down Expand Up @@ -128,7 +128,7 @@ jobs:
-DCV_ENABLE_INTRINSICS=OFF \
-DBUILD_opencv_dnn=ON \
..
make -j2
make -j
make install
em++ -r -o ${GITHUB_WORKSPACE}/opencv_wasm/libopencv.o \
-Wl,--whole-archive ${GITHUB_WORKSPACE}/opencv_wasm/lib/*.a \
Expand All @@ -142,7 +142,7 @@ jobs:
echo "-----"
mkdir src/build && cd $_
emcmake cmake -DCMAKE_BUILD_TYPE=Release -DOpenCV_DIR=${GITHUB_WORKSPACE}/opencv_wasm/lib/cmake/opencv4 -DWASM_LIB=${GITHUB_WORKSPACE}/opencv_wasm/libopencv.o ..
make -j2
make -j
ls OpenCvSharpExtern
cp OpenCvSharpExtern/libOpenCvSharpExtern.a ${GITHUB_WORKSPACE}/nuget/
Expand All @@ -151,9 +151,9 @@ jobs:
echo TODO
- name: Install .NET
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: '6.0.x'
dotnet-version: '8.0.x'

- name: Create NuGet package
env:
Expand All @@ -166,7 +166,7 @@ jobs:
dotnet pack ${GITHUB_WORKSPACE}/nuget/OpenCvSharp4.runtime.wasm.csproj -o ${GITHUB_WORKSPACE}/artifacts_wasm
ls ${GITHUB_WORKSPACE}/artifacts_wasm
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: artifacts_wasm
path: artifacts_wasm
Expand Down

0 comments on commit d483e90

Please sign in to comment.