Skip to content

Commit

Permalink
x
Browse files Browse the repository at this point in the history
  • Loading branch information
ctiller committed Jan 31, 2025
1 parent ee58e28 commit 08672de
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion tools/internal_ci/helper_scripts/prepare_build_linux_rc
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ fi

git submodule update --init

python3 -m pip install six
python3 -m pip install six Mako

# Allows the test driver to spin up a GDB subprocess and have it attach to
# another subprocess of the test driver.
Expand Down
8 changes: 4 additions & 4 deletions tools/internal_ci/helper_scripts/prepare_build_macos_rc
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,10 @@ if [ -n "$KOKORO_GITHUB_PULL_REQUEST_NUMBER" ]; then
export RUN_TESTS_FLAGS="--filter_pr_tests --base_branch origin/$KOKORO_GITHUB_PULL_REQUEST_TARGET_BRANCH $RUN_TESTS_FLAGS"
fi

# python
time pip install --user -r $DIR/requirements.macos.txt
time pip install --user --upgrade virtualenv Mako tox setuptools==44.1.1 twisted

if [ "${PREPARE_BUILD_INSTALL_DEPS_RUBY}" == "true" ]
then
# Workaround for https://github.com/rvm/rvm/issues/5133
Expand Down Expand Up @@ -121,10 +125,6 @@ fi

if [ "${PREPARE_BUILD_INSTALL_DEPS_PYTHON}" == "true" ]
then
# python
time pip install --user -r $DIR/requirements.macos.txt
time pip install --user --upgrade virtualenv Mako tox setuptools==44.1.1 twisted

# Force reinstall of python3.7 to upgrade its patch version.
# Kokoro mac workers come with python 3.7.3 and that version
# suffers from https://bugs.python.org/issue22490.
Expand Down

0 comments on commit 08672de

Please sign in to comment.