From a9e2c07d5b40bbab2a25903e164da57377f9f477 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=B5=E5=B0=8F=E5=87=A1?= <2672931+whyb@users.noreply.github.com> Date: Sun, 19 Jan 2025 21:31:59 +0800 Subject: [PATCH] Fix gitHub ci error --- .github/workflows/ci.yml | 29 +++++++++++++++++++++++------ .github/workflows/release.yml | 8 ++++---- 2 files changed, 27 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 382f8ff..4137f19 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -84,9 +84,6 @@ jobs: - name: Install dependencies run: | choco install cmake --version=3.31.3 - dir C:\tools\ - dir C:\tools\opencv\ - dir C:\tools\opencv\build - name: CMake Configure & Generate run: cmake -S . -B build -DBUILD_EXAMPLE:BOOL="1" -DBUILD_BENCHMARK:BOOL="1" -DUSE_OPENMP:BOOL="1" -A Win32 @@ -115,9 +112,6 @@ jobs: - name: Install dependencies run: | choco install cmake --version=3.31.3 - dir C:\tools\ - dir C:\tools\opencv\ - dir C:\tools\opencv\build - name: CMake Configure & Generate run: cmake -S . -B build -DBUILD_EXAMPLE:BOOL="1" -DBUILD_BENCHMARK:BOOL="1" -DUSE_OPENMP:BOOL="1" -A ARM64 @@ -125,3 +119,26 @@ jobs: - name: Build run: cmake --build build --config Release + + + build-windows-arm32: + runs-on: windows-latest + steps: + - name: Check out the repository + uses: actions/checkout@v4 + + - name: Setup MSVC Developer Command Prompt + uses: TheMrMilchmann/setup-msvc-dev@v3.0.1 + with: + arch: amd64_arm + + - name: Install dependencies + run: | + choco install cmake --version=3.31.3 + + - name: CMake Configure & Generate + run: cmake -S . -B build -DBUILD_EXAMPLE:BOOL="1" -DBUILD_BENCHMARK:BOOL="1" -DUSE_OPENMP:BOOL="1" -A ARM + + - name: Build + run: cmake --build build --config Release + diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a95ab9a..8562b2a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -41,7 +41,7 @@ jobs: - name: Archive Linux build artifacts uses: actions/upload-artifact@v4 with: - name: linux-artifacts + name: linux-x64-artifacts path: ./bin-linux-gcc-x64.zip build-windows-x64: @@ -79,7 +79,7 @@ jobs: - name: Archive Windows build artifacts uses: actions/upload-artifact@v4 with: - name: windows-artifacts + name: windows-x64-artifacts path: | ./bin-windows-msvc-x64.zip @@ -117,7 +117,7 @@ jobs: - name: Archive Windows build artifacts uses: actions/upload-artifact@v4 with: - name: windows-artifacts + name: windows-x86-artifacts path: | ./bin-windows-msvc-x86.zip @@ -155,7 +155,7 @@ jobs: - name: Archive Windows build artifacts uses: actions/upload-artifact@v4 with: - name: windows-artifacts + name: windows-arm64-artifacts path: | ./bin-windows-msvc-arm64.zip