Skip to content

fix errors in start-psbootstrap during release builds #6159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TravisEz13 merged 4 commits into from
Mar 12, 2018
Merged

fix errors in start-psbootstrap during release builds #6159

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9f27694
add libffi which is needed for ruby
TravisEz13 Feb 14, 2018
0bb63d2
fix gem versions
TravisEz13 Feb 14, 2018
73cc125
make RPM and SUSE variants use libffi-devel
TravisEz13 Feb 14, 2018
227367f
address PR feedback
TravisEz13 Feb 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 17 additions & 8 deletions build.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1552,12 +1552,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
Expand All @@ -1567,7 +1576,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

Expand All @@ -1588,7 +1597,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"
Expand Down Expand Up @@ -1624,8 +1633,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."
}
Expand Down