Skip to content

Commit 851296b

Browse files
Wheels: Fix duplicate ID (openPMD#1696)
* Fix previous: Duplicate ID * Exclude cmake/dependencies/pybind11.cmake from patch ??
1 parent 378b7c5 commit 851296b

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

.github/workflows/build.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ jobs:
9797
# Patch: PYBIND11_FINDPYTHON=ON
9898
- name: Download Patch 2/2
9999
uses: suisei-cn/actions-download-file@818d6b7dc8fe73f2f924b6241f2b1134ca1377d9 # 1.6.0
100-
id: setupversion
100+
id: setupfindpython
101101
with:
102102
url: "https://github.com/openPMD/openPMD-api/pull/1684.patch"
103103
target: src/.patch/
@@ -106,7 +106,9 @@ jobs:
106106
run: |
107107
cd src
108108
git apply --exclude=.github/workflows/windows.yml .patch/1680.patch
109-
git apply .patch/1684.patch
109+
git apply --exclude=cmake/dependencies/pybind11.cmake .patch/1684.patch
110+
git fetch
111+
git apply --exclude=setup.py -3 .patch/1684.patch
110112
111113
- name: Build wheel
112114
env:

0 commit comments

Comments
 (0)