Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: macos: make sure $HOME/.local/bin present in PATH #3302

Merged
merged 1 commit into from
Oct 19, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
ci: macos: make sure $HOME/.local/bin present in PATH
Signed-off-by: Tao He <[email protected]>
sighingnow committed Oct 19, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit c1077ad4cabb9eb50b98ad668e83c1bab399c16d
6 changes: 6 additions & 0 deletions .cirrus.yml
Original file line number Diff line number Diff line change
@@ -75,6 +75,9 @@ macosx_arm64_wheel_task:
# for building GLE
git config --global --add safe.directory .

# make sure the python's local bin is in PATH (by `pip install --user`)
export PATH=$HOME/.local/bin:$PATH

# prepare
pushd ./python
python3 setup.py build_proto
@@ -100,6 +103,9 @@ macosx_arm64_wheel_task:
build_graphscope_client_script: |
. ~/.graphscope_env

# make sure the python's local bin is in PATH (by `pip install --user`)
export PATH=$HOME/.local/bin:$PATH

for py in 3.8.16 3.9.16 3.10.10 3.11.2; do
current_python=$(pyenv root)/versions/$py/bin/python
echo "Python is: $current_python, $($current_python --version)"
9 changes: 7 additions & 2 deletions .github/workflows/build-graphscope-wheels-macos.yml
Original file line number Diff line number Diff line change
@@ -95,6 +95,9 @@ jobs:
python3 -m pip install libclang
echo ${CC}

# make sure the python's local bin is in PATH (by `pip install --user`)
export PATH=$HOME/.local/bin:$PATH

# change the version for nightly release
# e.g. 0.15.0 -> 0.15.0a20220808
time=$(date "+%Y%m%d")
@@ -186,6 +189,9 @@ jobs:
python3 -c "import sys; print(sys.version)"
. ~/.graphscope_env

# make sure the python's local bin is in PATH (by `pip install --user`)
export PATH=$HOME/.local/bin:$HOME/Library/Python/${{ matrix.python-version }}/bin:$PATH

# change the version for nightly release
# 0.15.0 -> 0.15.0a20220808
time=$(date "+%Y%m%d")
@@ -298,8 +304,7 @@ jobs:
GS_TEST_DIR: ${{ github.workspace }}/gstest
run: |
export JAVA_HOME=$(/usr/libexec/java_home -v11)
export PATH=$JAVA_HOME/bin:$HOME/.local/bin:$PATH
export PATH=$HOME/Library/Python/${{ matrix.python-version }}/bin:$PATH
export PATH=$JAVA_HOME/bin:$HOME/.local/bin:$HOME/Library/Python/${{ matrix.python-version }}/bin:$PATH

python3 -c "import sys; print(sys.version)"
git clone -b master --single-branch --depth=1 https://github.com/7br/gstest.git ${GS_TEST_DIR}
2 changes: 1 addition & 1 deletion python/graphscope/gsctl/scripts/install_deps_command.sh
Original file line number Diff line number Diff line change
@@ -331,7 +331,7 @@ write_env_config() {
{
echo "export GRAPHSCOPE_HOME=${install_prefix}"
echo "export CMAKE_PREFIX_PATH=/opt/vineyard"
echo "export PATH=${install_prefix}/bin:\$HOME/.cargo/bin:\$PATH"
echo "export PATH=${install_prefix}/bin:\$HOME/.local/bin:\$HOME/.cargo/bin:\$PATH"
echo "export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}"
echo "export LIBRARY_PATH=${install_prefix}/lib:${install_prefix}/lib64"
} >>"${OUTPUT_ENV_FILE}"