Skip to content

Commit

Permalink
Working around a build time segfault with FFI 1.13
Browse files Browse the repository at this point in the history
Signed-off-by: tyler-ball <tball@chef.io>
  • Loading branch information
tyler-ball committed Jun 2, 2020
1 parent cf52bf1 commit 47effac
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 18 deletions.
3 changes: 3 additions & 0 deletions components/gems/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@

source "https://rubygems.org"

# We found a segfault in ffi 1.13
gem "ffi", "< 1.13.0"

group(:omnibus_package, :development, :test) do
# Require a minimum version that is packaged in the Ruby install, so we do
# not install old unecessary versions. When we bump Ruby we need to look
Expand Down
7 changes: 4 additions & 3 deletions components/gems/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -393,9 +393,9 @@ GEM
faraday (>= 0.7.4, < 1.0)
fauxhai-ng (8.2.0)
net-ssh
ffi (1.13.0)
ffi (1.13.0-x64-mingw32)
ffi (1.13.0-x86-mingw32)
ffi (1.12.1)
ffi (1.12.1-x64-mingw32)
ffi (1.12.1-x86-mingw32)
ffi-libarchive (1.0.0)
ffi (~> 1.0)
ffi-rzmq (2.0.7)
Expand Down Expand Up @@ -1050,6 +1050,7 @@ DEPENDENCIES
docker-api
ed25519
fauxhai-ng (~> 8)
ffi (< 1.13.0)
ffi-libarchive
ffi-rzmq-core
foodcritic (>= 16.2)
Expand Down
3 changes: 3 additions & 0 deletions omnibus/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ gem "artifactory"

gem "pedump"

# We found a segfault in ffi 1.13
gem "ffi", "< 1.13.0"

# This development group is installed by default when you run `bundle install`,
# but if you are using Omnibus in a CI-based infrastructure, you do not need
# the Test Kitchen-based build lab. You can skip these unnecessary dependencies
Expand Down
7 changes: 4 additions & 3 deletions omnibus/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -171,9 +171,9 @@ GEM
erubis (2.7.0)
faraday (1.0.1)
multipart-post (>= 1.2, < 3)
ffi (1.13.0)
ffi (1.13.0-x64-mingw32)
ffi (1.13.0-x86-mingw32)
ffi (1.12.2)
ffi (1.12.2-x64-mingw32)
ffi (1.12.2-x86-mingw32)
ffi-libarchive (1.0.0)
ffi (~> 1.0)
ffi-win32-extensions (1.0.3)
Expand Down Expand Up @@ -393,6 +393,7 @@ PLATFORMS
DEPENDENCIES
artifactory
berkshelf (>= 7.0)
ffi (< 1.13.0)
kitchen-vagrant
omnibus!
omnibus-software!
Expand Down
28 changes: 16 additions & 12 deletions omnibus/kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ driver:
name: vagrant
forward_agent: yes
synced_folders:
- ['..', '/home/vagrant/chef-workstation']
- ['../../omnibus', '/home/vagrant/omnibus']
- ['../../omnibus-software', '/home/vagrant/omnibus-software']
# - ['..', 'C:/vagrant/chef-workstation']
- ['../../omnibus', 'C:/vagrant/omnibus']
- ['../../omnibus-software', 'C:/vagrant/omnibus-software']
customize:
cpus: 6
memory: 4096
Expand Down Expand Up @@ -41,11 +41,15 @@ platforms:
driver:
box: tas50/windows_2012r2
synced_folders:
# We have to mount this repos enclosing folder as the Omnibus build
# gets cranky if the mounted Chef Workstation source folder is a symlink. This
# mounts at `C:\vagrant\code` and the Chef Workstation source folder is available
# at `C:\vagrant\code\chef-workstation`
- ['../..', '/vagrant/code']
# We have to mount this repos enclosing folder as the Omnibus build
# gets cranky if the mounted Chef Workstation source folder is a symlink. This
# mounts at `C:\vagrant\code` and the Chef Workstation source folder is available
# at `C:\vagrant\code\chef-workstation`
- ['../..', '/vagrant/code']
transport:
winrm:
username: vagrant
password: "nA<upwS6u!VfTx)z"

suites:
- name: default
Expand All @@ -54,7 +58,7 @@ suites:
omnibus:
build_user: vagrant
build_user_group: vagrant
build_user_password: vagrant
build_user_home: /home/vagrant
build_dir: /home/vagrant/chef-workstation/omnibus
install_dir: /opt/chef-workstation
build_user_password: "nA<upwS6u!VfTx)z"
build_user_home: C:/vagrant
build_dir: C:/vagrant/code/chef-workstation/omnibus
install_dir: C:/chef-workstation

0 comments on commit 47effac

Please sign in to comment.