Skip to content

Commit

Permalink
fix: use environment variable for PIP_ROOT_USER_ACTION
Browse files Browse the repository at this point in the history
This extends the fix from actions#259 since every platform for 3.8.10 / 3.9.13 has been rebuilt instead of just macOS arm64 being added.

The regression was introduced in actions#223
  • Loading branch information
mayeut committed Apr 26, 2024
1 parent d05150c commit 56e722b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion installers/nix-setup-template.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,9 @@ fi
chmod +x ../python $PYTHON_MAJOR $PYTHON_MAJOR_DOT_MINOR $PYTHON_MAJORMINOR python

echo "Upgrading pip..."
export PIP_ROOT_USER_ACTION=ignore
./python -m ensurepip
./python -m pip install --ignore-installed pip --disable-pip-version-check --no-warn-script-location --root-user-action=ignore
./python -m pip install --ignore-installed pip --disable-pip-version-check --no-warn-script-location

echo "Create complete file"
touch $PYTHON_TOOLCACHE_VERSION_PATH/x64.complete
3 changes: 2 additions & 1 deletion installers/win-setup-template.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,9 @@ if ($MajorVersion -ne "2") {
}

Write-Host "Install and upgrade Pip"
$Env:PIP_ROOT_USER_ACTION = "ignore"
$PythonExePath = Join-Path -Path $PythonArchPath -ChildPath "python.exe"
cmd.exe /c "$PythonExePath -m ensurepip && $PythonExePath -m pip install --upgrade pip --no-warn-script-location --root-user-action=ignore"
cmd.exe /c "$PythonExePath -m ensurepip && $PythonExePath -m pip install --upgrade pip --no-warn-script-location"
if ($LASTEXITCODE -ne 0) {
Throw "Error happened during pip installation / upgrade"
}
Expand Down

0 comments on commit 56e722b

Please sign in to comment.