Skip to content

Commit

Permalink
Fix gitHub ci error
Browse files Browse the repository at this point in the history
whyb committed Jan 19, 2025
1 parent d115aaa commit a9e2c07
Showing 2 changed files with 27 additions and 10 deletions.
29 changes: 23 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -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,13 +112,33 @@ 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

- 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

8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit a9e2c07

Please sign in to comment.