From 7d635464511b104ac1c1cfb6b081dbc0020055c6 Mon Sep 17 00:00:00 2001 From: Khairul Azhar Kasmiran Date: Sat, 26 Oct 2024 00:05:51 +0800 Subject: [PATCH] mac ci: Make PATH invariant to installed Python version (#4689) --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fa41cddc5a..c438390c61 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -221,7 +221,7 @@ jobs: - name: Build with Meson if: matrix.build_system == 'meson' && matrix.enabled 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 # Work-around ASAN bug https://github.com/google/sanitizers/issues/1716 sudo sysctl vm.mmap_rnd_bits=28 @@ -239,7 +239,7 @@ jobs: if: matrix.build_system == 'meson' && matrix.enabled run: | # 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 PKG_CONFIG_PATH=${HOME}/lib/pkgconfig:${HOME}/lib/$(uname -m)-linux-gnu/pkgconfig:${PKG_CONFIG_PATH} ninja -C build install @@ -251,7 +251,7 @@ jobs: continue-on-error: ${{ matrix.allow_failure }} if: matrix.build_system == 'meson' && matrix.enabled 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 PKG_CONFIG_PATH=${HOME}/lib/pkgconfig:${HOME}/lib/$(uname -m)-linux-gnu/pkgconfig:${PKG_CONFIG_PATH} if [ "$ASAN" == "true" ]; then @@ -285,7 +285,7 @@ jobs: if: matrix.run_tests && matrix.enabled run: | # 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 PKG_CONFIG_PATH=${HOME}/lib/pkgconfig:${HOME}/lib/$(uname -m)-linux-gnu/pkgconfig:${PKG_CONFIG_PATH} if [ "$ASAN" == "true" ]; then