Skip to content

Commit 7a39e25

Browse files
author
bghira
committed
disable cross-compiler
1 parent 86e3f45 commit 7a39e25

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed

.github/workflows/publish.yml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
uses: actions/cache@v4
2323
with:
2424
path: third_party/opencv-static
25-
key: opencv-static-4.12.0-linux-${{ runner.os }}-${{ runner.arch }}
25+
key: opencv-static-4.12.0-v2-linux-${{ runner.os }}-${{ runner.arch }}
2626

2727
- name: Install build dependencies
2828
run: |
@@ -47,19 +47,18 @@ jobs:
4747
uses: PyO3/maturin-action@v1
4848
with:
4949
target: ${{ matrix.target }}
50-
args: --release --out dist --find-interpreter --zig --no-default-features --features python-bindings,simd,opencv
50+
args: --release --out dist --find-interpreter --no-default-features --features python-bindings,simd,opencv
5151
sccache: 'false'
52-
manylinux: auto
52+
manylinux: 2014
53+
container: off
5354
env:
5455
# Use stable ABI for forward compatibility
5556
PYO3_USE_ABI3_FORWARD_COMPATIBILITY: '1'
56-
# OpenCV environment probe needs these vars set
57+
# OpenCV static linking configuration
5758
OPENCV_INCLUDE_PATHS: ${{ github.workspace }}/third_party/opencv-static/include/opencv4
5859
OPENCV_LINK_PATHS: ${{ github.workspace }}/third_party/opencv-static/lib
5960
OPENCV_LINK_LIBS: static=opencv_world,static=stdc++
6061
OPENCV_DISABLE_PROBES: pkg_config,cmake,vcpkg,vcpkg_cmake
61-
# Also pass .a file directly via RUSTFLAGS to force zig to use static lib
62-
RUSTFLAGS: -C link-arg=${{ github.workspace }}/third_party/opencv-static/lib/libopencv_world.a
6362

6463
- name: Upload wheels
6564
uses: actions/upload-artifact@v4
@@ -84,7 +83,7 @@ jobs:
8483
uses: actions/cache@v4
8584
with:
8685
path: third_party/opencv-static
87-
key: opencv-static-4.12.0-macos-${{ runner.os }}-${{ runner.arch }}
86+
key: opencv-static-4.12.0-v2-macos-${{ runner.os }}-${{ runner.arch }}
8887

8988
- name: Install build dependencies
9089
run: |
@@ -109,13 +108,11 @@ jobs:
109108
env:
110109
# Use stable ABI for forward compatibility
111110
PYO3_USE_ABI3_FORWARD_COMPATIBILITY: '1'
112-
# OpenCV environment probe needs these vars set
111+
# OpenCV static linking configuration
113112
OPENCV_INCLUDE_PATHS: ${{ github.workspace }}/third_party/opencv-static/include/opencv4
114113
OPENCV_LINK_PATHS: ${{ github.workspace }}/third_party/opencv-static/lib
115114
OPENCV_LINK_LIBS: static=opencv_world,framework=Accelerate,dylib=c++
116115
OPENCV_DISABLE_PROBES: pkg_config,cmake,vcpkg,vcpkg_cmake
117-
# Also pass .a file directly via RUSTFLAGS to force static lib usage
118-
RUSTFLAGS: -C link-arg=${{ github.workspace }}/third_party/opencv-static/lib/libopencv_world.a
119116
- name: Upload wheels
120117
uses: actions/upload-artifact@v4
121118
with:

0 commit comments

Comments
 (0)