Skip to content

Commit 616f15a

Browse files
lgritzscott-wilson
authored andcommitted
build: fix recently broken rpath to restore python wheel building (AcademySoftwareFoundation#4633)
Also, make the wheel workflow work on pushes when the branch name contains the substring "python" or "wheel", and when any of the cmake build files in src/cmake (which control building of dependencies, among other things), even if none of the python bindings themselves are touched. This means that if you suspect your work might cause a wheel to break even though you're not modifying the python bindings directly, you can ensure that the wheel workflow will run on CI simply by naming your branch to contain one of those words. Signed-off-by: Larry Gritz <[email protected]> Signed-off-by: Scott Wilson <[email protected]>
1 parent ade6f11 commit 616f15a

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

.github/workflows/wheel.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,25 @@ permissions:
1414
on:
1515
push:
1616
# Workflow run on tags for v3 only, or pre-tagged pushes of release, or
17-
# dev-3.* branches.
17+
# dev-3.* branches. Also if the branch name itself contains the substrings
18+
# 'wheel' or 'python'.
1819
tags:
1920
- v3.*
2021
branches:
2122
- release
2223
- dev-3.*
24+
- "*wheel*"
25+
- "*python*"
2326
pull_request:
24-
# Workflow run on pull_request only when related files change.
27+
# Workflow run on pull_request only when related files change, or when the
28+
# branch name itself contains the substrings 'wheel' or 'python'.
2529
paths:
2630
- .github/workflows/wheel.yml
2731
- pyproject.toml
2832
- src/python/*.py
2933
- src/python/*.h
3034
- src/python/*.cpp
31-
- src/cmake/pythonutils.cmake
35+
- src/cmake/*.cmake
3236
schedule:
3337
# Nightly build
3438
- cron: "0 8 * * *"

src/cmake/compiler.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -691,6 +691,7 @@ else ()
691691
set(BASEPOINT $ORIGIN)
692692
endif()
693693
set (CMAKE_INSTALL_RPATH ${BASEPOINT}
694+
${BASEPOINT}/${CMAKE_INSTALL_LIBDIR}
694695
${BASEPOINT}/../${CMAKE_INSTALL_LIBDIR})
695696
endif ()
696697
# add the automatically determined parts of the RPATH that

0 commit comments

Comments
 (0)