mirror of
https://github.com/actions/runner-images.git
synced 2025-12-15 14:17:22 +00:00
resolved comments
This commit is contained in:
@@ -8,18 +8,11 @@ pipx_packages=$(jq -r ".pipx[] .package" $toolset)
|
|||||||
for package in $pipx_packages; do
|
for package in $pipx_packages; do
|
||||||
python_version=$(jq -r ".pipx[] | select(.package == \"$package\") .python" $toolset)
|
python_version=$(jq -r ".pipx[] | select(.package == \"$package\") .python" $toolset)
|
||||||
if [ "$python_version" != "null" ]; then
|
if [ "$python_version" != "null" ]; then
|
||||||
python_path="/opt/hostedtoolcache/Python/$python_version*/x64/bin/python$python_version"
|
python_path="$HOME/hostedtoolcache/Python/$python_version*/x64/bin/python$python_version"
|
||||||
echo "Install $package into python $python_path"
|
echo "Install $package into python $python_path"
|
||||||
pipx install $package --python $python_path
|
pipx install $package --python $python_path
|
||||||
else
|
else
|
||||||
echo "Install $package into default python"
|
echo "Install $package into default python"
|
||||||
pipx install $package
|
pipx install $package
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Run tests to determine that the software installed as expected
|
|
||||||
cmd=$(jq -r ".pipx[] | select(.package == \"$package\") .cmd" $toolset)
|
|
||||||
if ! command -v $cmd; then
|
|
||||||
echo "$package was not installed"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
done
|
done
|
||||||
@@ -13,11 +13,10 @@ FORMULA_PATH=$(/usr/local/bin/brew extract python@2 local/python2 | grep "Homebr
|
|||||||
/usr/local/bin/brew install $FORMULA_PATH
|
/usr/local/bin/brew install $FORMULA_PATH
|
||||||
|
|
||||||
echo "Installing pipx"
|
echo "Installing pipx"
|
||||||
export PIPX_BIN_DIR=/opt/pipx_bin
|
export PIPX_BIN_DIR=/usr/local/opt/pipx_bin
|
||||||
export PIPX_HOME=/opt/pipx
|
export PIPX_HOME=/usr/local/opt/pipx
|
||||||
|
|
||||||
brew install pipx
|
brew install pipx
|
||||||
python3 -m pipx ensurepath
|
|
||||||
|
|
||||||
echo "export PIPX_BIN_DIR=${PIPX_BIN_DIR}" >> "${HOME}/.bashrc"
|
echo "export PIPX_BIN_DIR=${PIPX_BIN_DIR}" >> "${HOME}/.bashrc"
|
||||||
echo "export PIPX_HOME=${PIPX_HOME}" >> "${HOME}/.bashrc"
|
echo "export PIPX_HOME=${PIPX_HOME}" >> "${HOME}/.bashrc"
|
||||||
|
|||||||
@@ -31,4 +31,8 @@ Describe "Python" {
|
|||||||
It "Pip 3 is available" {
|
It "Pip 3 is available" {
|
||||||
"pip3 --version" | Should -ReturnZeroExitCode
|
"pip3 --version" | Should -ReturnZeroExitCode
|
||||||
}
|
}
|
||||||
|
|
||||||
|
It "Pipx is available" {
|
||||||
|
"pipx --version" | Should -ReturnZeroExitCode
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user