Skip to content

Commit

Permalink
Merged PR 22078: Some adjustments to windows GitHub actions pipelines
Browse files Browse the repository at this point in the history
Some adjustments to windows github actions pipeline, adjusting arch value for windows platforms.
  • Loading branch information
bjoernrennfanz committed Nov 9, 2023
2 parents a5bf686 + bc1d66f commit 70a7a5c
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -147,14 +147,14 @@ jobs:

- name: Setup pylon
run: |
# install pylon
cd pylon-installer
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"
shell: cmd

- name: Build wheels
uses: pypa/[email protected]
env:
PYLON_DEV_DIR: "C:\Program Files\Basler\pylon 7\Development"
PYLON_DEV_DIR: "C:\\Program Files\\Basler\\pylon 7\\Development"

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


build-macos:
Expand Down
10 changes: 5 additions & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ requires = ["setuptools>=42", "swig>=4.0", "wheel"]
build-backend = "setuptools.build_meta"

[tool.cibuildwheel]
build-verbosity = "0"
archs = "x86_64 arm64"
build = "*-macosx_*"
skip = "pp*"
build-verbosity = "0"
test-requires = "pytest numpy"

[tool.cibuildwheel.windows]
archs = "AMD64"
build = "*-win_*"
before-all = 'echo "Building: %CIBW_BUILD%"'
test-command = [
'''
Expand All @@ -18,6 +18,8 @@ test-command = [
]

[tool.cibuildwheel.macos]
archs = "x86_64 arm64"
build = "*-macosx_*"
before-all = 'echo "Building: $CIBW_BUILD"'
repair-wheel-command = ""
test-command = [
Expand All @@ -26,7 +28,6 @@ test-command = [
'''
]


[[tool.cibuildwheel.overrides]]
select = "*-macosx_arm64"
before-build = [
Expand All @@ -52,4 +53,3 @@ before-build = [
'''
]
environment = { SYSTEM_VERSION_COMPAT="0",PYLON_FRAMEWORK_LOCATION="${PYLON_FRAMEWORK_X86_64}",MACOSX_DEPLOYMENT_TARGET="11.0" }

0 comments on commit 70a7a5c

Please sign in to comment.