diff --git a/.github/workflows/build-python-packages.yml b/.github/workflows/build-python-packages.yml index a57d794e..2b80a022 100644 --- a/.github/workflows/build-python-packages.yml +++ b/.github/workflows/build-python-packages.yml @@ -123,6 +123,7 @@ jobs: - name: Apply build artifact to the local machine run: | + $PSNativeCommandUseErrorActionPreference = $true if ('${{ matrix.platform }}' -eq 'win32') { powershell ./setup.ps1 } else { diff --git a/installers/nix-setup-template.sh b/installers/nix-setup-template.sh index 32fa2326..1aa0e723 100644 --- a/installers/nix-setup-template.sh +++ b/installers/nix-setup-template.sh @@ -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 diff --git a/installers/win-setup-template.ps1 b/installers/win-setup-template.ps1 index f0ea70d5..12dca02b 100644 --- a/installers/win-setup-template.ps1 +++ b/installers/win-setup-template.ps1 @@ -133,8 +133,12 @@ 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" +} Write-Host "Create complete file" New-Item -ItemType File -Path $PythonVersionPath -Name "$Architecture.complete" | Out-Null