Skip to content

Commit 70a7a5c

Browse files
Merged PR 22078: Some adjustments to windows GitHub actions pipelines
Some adjustments to windows github actions pipeline, adjusting arch value for windows platforms.
2 parents a5bf686 + bc1d66f commit 70a7a5c

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

.github/workflows/main.yml

+5-4
Original file line numberDiff line numberDiff line change
@@ -147,14 +147,14 @@ jobs:
147147

148148
- name: Setup pylon
149149
run: |
150-
# install pylon
151150
cd pylon-installer
152151
basler_pylon_7_4_0_14900.exe /quiet /install="GigE_Support;USB_Support;Camera_Link_Support;CoaXPress_Support;GenTL_Consumer_Support;CamEmu_Support;SDKs;DataProcessing_SDK"
152+
shell: cmd
153153

154154
- name: Build wheels
155155
uses: pypa/[email protected]
156156
env:
157-
PYLON_DEV_DIR: "C:\Program Files\Basler\pylon 7\Development"
157+
PYLON_DEV_DIR: "C:\\Program Files\\Basler\\pylon 7\\Development"
158158

159159
- uses: actions/upload-artifact@v3
160160
with:
@@ -171,8 +171,9 @@ jobs:
171171
- name: Publish package to (Test)PyPI
172172
if: needs.prepare.outputs.is_release_build == 'true'
173173
run: |
174-
sudo pip install twine
175-
python -m twine upload --non-interactive --skip-existing wheelhouse/*
174+
python -m pip install twine
175+
python -m twine upload --non-interactive --skip-existing wheelhouse\\*
176+
shell: cmd
176177

177178

178179
build-macos:

pyproject.toml

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ requires = ["setuptools>=42", "swig>=4.0", "wheel"]
33
build-backend = "setuptools.build_meta"
44

55
[tool.cibuildwheel]
6-
build-verbosity = "0"
7-
archs = "x86_64 arm64"
8-
build = "*-macosx_*"
96
skip = "pp*"
7+
build-verbosity = "0"
108
test-requires = "pytest numpy"
119

1210
[tool.cibuildwheel.windows]
11+
archs = "AMD64"
12+
build = "*-win_*"
1313
before-all = 'echo "Building: %CIBW_BUILD%"'
1414
test-command = [
1515
'''
@@ -18,6 +18,8 @@ test-command = [
1818
]
1919

2020
[tool.cibuildwheel.macos]
21+
archs = "x86_64 arm64"
22+
build = "*-macosx_*"
2123
before-all = 'echo "Building: $CIBW_BUILD"'
2224
repair-wheel-command = ""
2325
test-command = [
@@ -26,7 +28,6 @@ test-command = [
2628
'''
2729
]
2830

29-
3031
[[tool.cibuildwheel.overrides]]
3132
select = "*-macosx_arm64"
3233
before-build = [
@@ -52,4 +53,3 @@ before-build = [
5253
'''
5354
]
5455
environment = { SYSTEM_VERSION_COMPAT="0",PYLON_FRAMEWORK_LOCATION="${PYLON_FRAMEWORK_X86_64}",MACOSX_DEPLOYMENT_TARGET="11.0" }
55-

0 commit comments

Comments
 (0)