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

Update dependency_decisions for LicenseFinder 6.0; Fix deprecation warning with outdated win32-service gem pulled in by puppet #252

Merged
merged 3 commits into from
Feb 3, 2020

Conversation

DavidS
Copy link
Contributor

@DavidS DavidS commented Jan 27, 2020

See pivotal/LicenseFinder#665 for reference

@DavidS DavidS added the maintenance Maintenance (PDK sync and other maintaining commits) label Jan 27, 2020
@DavidS DavidS requested a review from a team January 27, 2020 11:17
@DavidS DavidS changed the title Update dependency_decisions for LicenseFinder 6.0 Update dependency_decisions for LicenseFinder 6.0; Fix deprecation warning with outdated win32-service gem pulled in by puppet Feb 3, 2020
@DavidS DavidS changed the title Update dependency_decisions for LicenseFinder 6.0; Fix deprecation warning with outdated win32-service gem pulled in by puppet Update dependency_decisions for LicenseFinder 6.0; Fix deprecation warning with outdated win32-service gem pulled in by puppet; add Gemfile.lock for dependabot Feb 3, 2020
@DavidS DavidS changed the title Update dependency_decisions for LicenseFinder 6.0; Fix deprecation warning with outdated win32-service gem pulled in by puppet; add Gemfile.lock for dependabot Update dependency_decisions for LicenseFinder 6.0; Fix deprecation warning with outdated win32-service gem pulled in by puppet Feb 3, 2020
expect(stdout_str.strip).to match %r{\A(DL is deprecated, please use Fiddle\n)?#{expected_values}\Z}
fiddle_deprecate_msg = "DL is deprecated, please use Fiddle\n"
win32_deprecate_msg = ".*Struct layout is already defined for class Windows::ServiceStructs::SERVICE_STATUS_PROCESS.*\n"
expect(stdout_str.strip).to match %r{\A(#{fiddle_deprecate_msg}|#{win32_deprecate_msg})?#{expected_values}\Z}

Choose a reason for hiding this comment

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

Instead of matching the, probably fragile, warning methods, could you use a multi-line regex

e,g, (Not sure of the exact syntax)

expect(stdout_str.strip).to match %r{#{expected_values}/m}

@DavidS
Copy link
Contributor Author

DavidS commented Feb 3, 2020

removed the last commit as travis support is reporting this is fixed on their side now.

* remove obsolete `sudo` key
* add `os: linux` default
* make the cache directories arrays as requested by the schema
* `matrix` -> `jobs`
* some YAML reformatting
@michaeltlombardi michaeltlombardi merged commit 9280afc into puppetlabs:master Feb 3, 2020
@DavidS DavidS deleted the fix-license-finder branch February 3, 2020 17:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
maintenance Maintenance (PDK sync and other maintaining commits)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants