mac ci: Make PATH invariant to installed Python version (#4689)
This commit is contained in:
parent
f82993a30d
commit
7d63546451
1 changed files with 4 additions and 4 deletions
8
.github/workflows/ci.yml
vendored
8
.github/workflows/ci.yml
vendored
|
|
@ -221,7 +221,7 @@ jobs:
|
||||||
- name: Build with Meson
|
- name: Build with Meson
|
||||||
if: matrix.build_system == 'meson' && matrix.enabled
|
if: matrix.build_system == 'meson' && matrix.enabled
|
||||||
run: |
|
run: |
|
||||||
export PATH=${HOME}/Library/Python/3.11/bin:${HOME}/Library/Python/3.12/bin:${HOME}/Library/Python/3.13/bin:${HOME}/.local/bin:${PATH}
|
export PATH=$(python3 -m site --user-base)/bin:${HOME}/.local/bin:${PATH}
|
||||||
if [ "$ASAN" == "true" ]; then
|
if [ "$ASAN" == "true" ]; then
|
||||||
# Work-around ASAN bug https://github.com/google/sanitizers/issues/1716
|
# Work-around ASAN bug https://github.com/google/sanitizers/issues/1716
|
||||||
sudo sysctl vm.mmap_rnd_bits=28
|
sudo sysctl vm.mmap_rnd_bits=28
|
||||||
|
|
@ -239,7 +239,7 @@ jobs:
|
||||||
if: matrix.build_system == 'meson' && matrix.enabled
|
if: matrix.build_system == 'meson' && matrix.enabled
|
||||||
run: |
|
run: |
|
||||||
# Install the rizin
|
# Install the rizin
|
||||||
export PATH=${HOME}/bin:${HOME}/Library/Python/3.11/bin:${HOME}/Library/Python/3.12/bin:${HOME}/Library/Python/3.13/bin:${HOME}/.local/bin:${PATH}
|
export PATH=${HOME}/bin:$(python3 -m site --user-base)/bin:${HOME}/.local/bin:${PATH}
|
||||||
export LD_LIBRARY_PATH=${HOME}/lib/$(uname -m)-linux-gnu:${HOME}/lib:${HOME}/lib64:${LD_LIBRARY_PATH}
|
export LD_LIBRARY_PATH=${HOME}/lib/$(uname -m)-linux-gnu:${HOME}/lib:${HOME}/lib64:${LD_LIBRARY_PATH}
|
||||||
export PKG_CONFIG_PATH=${HOME}/lib/pkgconfig:${HOME}/lib/$(uname -m)-linux-gnu/pkgconfig:${PKG_CONFIG_PATH}
|
export PKG_CONFIG_PATH=${HOME}/lib/pkgconfig:${HOME}/lib/$(uname -m)-linux-gnu/pkgconfig:${PKG_CONFIG_PATH}
|
||||||
ninja -C build install
|
ninja -C build install
|
||||||
|
|
@ -251,7 +251,7 @@ jobs:
|
||||||
continue-on-error: ${{ matrix.allow_failure }}
|
continue-on-error: ${{ matrix.allow_failure }}
|
||||||
if: matrix.build_system == 'meson' && matrix.enabled
|
if: matrix.build_system == 'meson' && matrix.enabled
|
||||||
run: |
|
run: |
|
||||||
export PATH=${HOME}/bin:${HOME}/Library/Python/3.11/bin:${HOME}/Library/Python/3.12/bin:${HOME}/Library/Python/3.13/bin:${HOME}/.local/bin:${PATH}
|
export PATH=${HOME}/bin:$(python3 -m site --user-base)/bin:${HOME}/.local/bin:${PATH}
|
||||||
export LD_LIBRARY_PATH=${HOME}/lib/$(uname -m)-linux-gnu:${HOME}/lib:${HOME}/lib64:${LD_LIBRARY_PATH}
|
export LD_LIBRARY_PATH=${HOME}/lib/$(uname -m)-linux-gnu:${HOME}/lib:${HOME}/lib64:${LD_LIBRARY_PATH}
|
||||||
export PKG_CONFIG_PATH=${HOME}/lib/pkgconfig:${HOME}/lib/$(uname -m)-linux-gnu/pkgconfig:${PKG_CONFIG_PATH}
|
export PKG_CONFIG_PATH=${HOME}/lib/pkgconfig:${HOME}/lib/$(uname -m)-linux-gnu/pkgconfig:${PKG_CONFIG_PATH}
|
||||||
if [ "$ASAN" == "true" ]; then
|
if [ "$ASAN" == "true" ]; then
|
||||||
|
|
@ -285,7 +285,7 @@ jobs:
|
||||||
if: matrix.run_tests && matrix.enabled
|
if: matrix.run_tests && matrix.enabled
|
||||||
run: |
|
run: |
|
||||||
# Running the test suite
|
# Running the test suite
|
||||||
export PATH=${HOME}/bin:${HOME}/Library/Python/3.11/bin:${HOME}/Library/Python/3.12/bin:${HOME}/Library/Python/3.13/bin:${HOME}/.local/bin:${PATH}
|
export PATH=${HOME}/bin:$(python3 -m site --user-base)/bin:${HOME}/.local/bin:${PATH}
|
||||||
export LD_LIBRARY_PATH=${HOME}/lib/$(uname -m)-linux-gnu:${HOME}/lib:${HOME}/lib64:${LD_LIBRARY_PATH}
|
export LD_LIBRARY_PATH=${HOME}/lib/$(uname -m)-linux-gnu:${HOME}/lib:${HOME}/lib64:${LD_LIBRARY_PATH}
|
||||||
export PKG_CONFIG_PATH=${HOME}/lib/pkgconfig:${HOME}/lib/$(uname -m)-linux-gnu/pkgconfig:${PKG_CONFIG_PATH}
|
export PKG_CONFIG_PATH=${HOME}/lib/pkgconfig:${HOME}/lib/$(uname -m)-linux-gnu/pkgconfig:${PKG_CONFIG_PATH}
|
||||||
if [ "$ASAN" == "true" ]; then
|
if [ "$ASAN" == "true" ]; then
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue