maxmustermann/PowerShell
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix errors in start-psbootstrap during release builds (#6159)

Browse source 
set Debian front end to non-interactive during apt-get commands, to avoid error with prompting
add libffi-dev, which is required for ruby/fpm
let fpm update to the latest
This commit is contained in:
Travis Plunk 2018-03-12 15:59:58 -07:00 committed by GitHub
parent 491ee47ee7
commit 982dbfe552
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
build.psm1
View file

@ -1575,12 +1575,21 @@ function Start-PSBootstrap {
elseif ($Environment.IsUbuntu16) { $Deps += "libicu55" }
# Packaging tools
if ($Package) { $Deps += "ruby-dev", "groff" }
if ($Package) { $Deps += "ruby-dev", "groff", "libffi-dev" }
# Install dependencies
Start-NativeExecution {
Invoke-Expression "$sudo apt-get update -qq"
Invoke-Expression "$sudo apt-get install -y -qq $Deps"
# change the fontend from apt-get to noninteractive
$originalDebianFrontEnd=$env:DEBIAN_FRONTEND
$env:DEBIAN_FRONTEND='noninteractive'
try {
Start-NativeExecution {
Invoke-Expression "$sudo apt-get update -qq"
Invoke-Expression "$sudo apt-get install -y -qq $Deps"
}
}
finally {
# change the apt frontend back to the original
$env:DEBIAN_FRONTEND=$originalDebianFrontEnd
}
} elseif ($Environment.IsRedHatFamily) {
# Build tools
@ -1590,7 +1599,7 @@ function Start-PSBootstrap {
$Deps += "libicu", "libunwind"
# Packaging tools
if ($Package) { $Deps += "ruby-devel", "rpm-build", "groff" }
if ($Package) { $Deps += "ruby-devel", "rpm-build", "groff", 'libffi-devel' }
$PackageManager = Get-RedHatPackageManager
@ -1611,7 +1620,7 @@ function Start-PSBootstrap {
$Deps += "gcc", "cmake", "make"
# Packaging tools
if ($Package) { $Deps += "ruby-devel", "rpmbuild", "groff" }
if ($Package) { $Deps += "ruby-devel", "rpmbuild", "groff", 'libffi-devel' }
$PackageManager = "zypper --non-interactive install"
$baseCommand = "$sudo $PackageManager"
@ -1647,8 +1656,8 @@ function Start-PSBootstrap {
if ($Package) {
try {
# We cannot guess if the user wants to run gem install as root
Start-NativeExecution { gem install fpm -v 1.8.1 }
Start-NativeExecution { gem install ronn }
Start-NativeExecution { gem install fpm -v 1.9.3 }
Start-NativeExecution { gem install ronn -v 0.7.3 }
} catch {
Write-Warning "Installation of fpm and ronn gems failed! Must resolve manually."
}