Skip to content

Commit 1f0e528

Browse files
committed
Remove redundant rubygem-ffi
The rubygem-ffi component was added in the agent-runtime-<version> project for all platforms and in the _shared-agent-components on Windows, etc. Just add it always in the _shared-agent-components, which is also included by _shared-pe-installer-runtime. $ git grep rubygem-ffi configs/projects/ configs/projects/_pdk-components.rb:proj.component 'rubygem-ffi' configs/projects/_shared-agent-components.rb:proj.component 'rubygem-ffi' configs/projects/_shared-pe-bolt-server.rb:proj.component('rubygem-ffi') configs/projects/_shared-pe-bolt-server_with_ruby.rb:proj.component('rubygem-ffi') configs/projects/_shared-pe-installer-runtime.rb:proj.component('rubygem-ffi') configs/projects/bolt-runtime.rb: proj.component 'rubygem-ffi' The only project that doesn't add the ffi rubygem is client-tools-runtime-*
1 parent 5444118 commit 1f0e528

File tree

3 files changed

+1
-3
lines changed

3 files changed

+1
-3
lines changed

configs/projects/_shared-agent-components.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@
6060
proj.component 'rubygem-locale'
6161
proj.component 'rubygem-gettext'
6262
proj.component 'rubygem-fast_gettext'
63+
proj.component 'rubygem-ffi'
6364

6465
if platform.is_windows? || platform.is_solaris? || platform.is_aix?
6566
proj.component 'rubygem-minitar'
66-
proj.component 'rubygem-ffi'
6767
end
6868

6969
if platform.is_macos?

configs/projects/agent-runtime-7.x.rb

-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
# When adding components to this list, please
5555
# add them to pe-installer-runtime-main as well
5656
proj.component 'rubygem-concurrent-ruby'
57-
proj.component 'rubygem-ffi'
5857
proj.component 'rubygem-multi_json'
5958
proj.component 'rubygem-optimist'
6059
proj.component 'rubygem-highline'

configs/projects/agent-runtime-main.rb

-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656
# When adding components to this list, please
5757
# add them to pe-installer-runtime-main as well
5858
proj.component 'rubygem-concurrent-ruby'
59-
proj.component 'rubygem-ffi'
6059
proj.component 'rubygem-multi_json'
6160
proj.component 'rubygem-optimist'
6261
proj.component 'rubygem-highline'

0 commit comments

Comments
 (0)