Skip to content
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.

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

(packaging) Bump shared rubygem component versions to latest #313

Merged
merged 3 commits into from Apr 8, 2020

Conversation

lucywyman
Copy link
Contributor

This updates rubygem component versions to their latest for gems that
are shared across multiple projects.

Specifically the @puppetlabs/installer-and-management team includes:
bcrypt_pbkdf
ffi
gettext-setup
locale
multi_json

The puppet-agent package includes:
concurrent-ruby
ffi
gettext-setup
locale
multi_json

The @puppetlabs/pdk package includes:
ffi
gettext-setup

@lucywyman lucywyman requested a review from a team April 1, 2020 18:06
@lucywyman lucywyman requested a review from a team as a code owner April 1, 2020 18:06
pkg.version '1.9.25'
pkg.md5sum "e8923807b970643d9e356a65038769ac"
pkg.version '1.12.2'
pkg.md5sum "28dc3d1294a04b728d24ba025e331b13"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know we've had some challenges with "ffi" versions in the past in PDK, I'll see if I can make an ad-hoc build with this PR and validate this works.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same with bolt on OSX. might be worth seeing that as well with this ffi

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lucywyman we need to update the md5 sums for the windows version of the ffi gem a little further down in the file.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@scotje Apologies, I dropped your commit since newer ffi breaks things on Windows (see comments below), so there's no need to update the checksums.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No worries!

This updates rubygem component versions to their latest for gems that
are shared across multiple projects.
@GabrielNagy
Copy link
Contributor

Was able to successfully build puppet-runtime for agent-master, also triggering a puppet-agent build with these changes.

@GabrielNagy
Copy link
Contributor

We're encountering some valid failures with the ffi gem installation on Solaris, so please do not merge this just yet.

@GabrielNagy
Copy link
Contributor

There are also vaild pxp-agent test failures on Windows:

18:12:01 Minitest::Assertion: Successful action expected to have no output on stderr.
18:12:01 Expected "[DEPRECATION] Struct layout is already defined for class Windows::ServiceStructs::SERVICE_STATUS_PROCESS. Redefinition as in C:/Program Files/Puppet Labs/Puppet/puppet/lib/ruby/gems/2.5.0/gems/win32-service-0.8.8/lib/win32/windows/structs.rb:67:in `<class:SERVICE_STATUS_PROCESS>' will be disallowed in ffi-2.0.\n" to be nil.

Traced that to chef/win32-service#70

We should hold back the FFI gem for Windows.

Pin ffi on Windows due to pxp-agent tests failing.

Even though they are deprecation warnings, having output on stderr may
break things in unexpected ways.

See: chef/win32-service#70
Copy link
Contributor

@GabrielNagy GabrielNagy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 this is good to go from Night's Watch

@scotje
Copy link
Contributor

scotje commented Apr 3, 2020

Still working to test a PDK build, the pdk gem itself was pinned to ffi 1.9.x so I've expanded the range it will accept and am testing with updated runtime now.

Copy link
Contributor

@scotje scotje left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got a passing build of PDK through, with this change.

@lucywyman
Copy link
Contributor Author

@donoghuc One more lookover from skeletor? @actowery Would you be willing to look this over and verify the updates to packages that the installer team consumes will work?

@donoghuc
Copy link
Member

donoghuc commented Apr 6, 2020

If you can get bolt builds on all the osx platforms them i'm good. We only build bolt-server for master platforms. i was just noting that I had previously had problems building ffi > 1.9.25 on osx platforms.

@shaigy
Copy link
Contributor

shaigy commented Apr 8, 2020

👍 Didn't find any conflicts for installer team projects.

@lucywyman lucywyman merged commit d1773af into puppetlabs:master Apr 8, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants