update ruby with nokogiri #3009
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.8 to 1.14.0. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md) - [Commits](sparklemotion/nokogiri@v1.13.8...v1.14.0) --- updated-dependencies: - dependency-name: nokogiri dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Dheeraj Singh Dubey <dhsingh@progress.com>
👷 Deploy Preview for chef-supermarket processing.
|
Signed-off-by: Dheeraj Singh Dubey <dhsingh@progress.com>
dheerajd-msys
force-pushed
the
dheeraj/update-ruby-with-nokogiri
branch
from
6dc0fcf
to
e21c5e2
Compare
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.8 to 1.13.10. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/v1.13.10/CHANGELOG.md) - [Commits](sparklemotion/nokogiri@v1.13.8...v1.13.10) --- updated-dependencies: - dependency-name: nokogiri dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Dheeraj Singh Dubey <dhsingh@progress.com>
|
Adhoc build is green https://buildkite.com/chef/chef-supermarket-main-omnibus-adhoc/builds/632 |
dheerajd-msys
force-pushed
the
dheeraj/update-ruby-with-nokogiri
branch
3 times, most recently
from
669d5f3
to
973ee4d
Compare
Signed-off-by: Dheeraj Singh Dubey <dhsingh@progress.com>
dheerajd-msys
force-pushed
the
dheeraj/update-ruby-with-nokogiri
branch
from
973ee4d
to
7e7012b
Compare
Signed-off-by: Dheeraj Singh Dubey <dhsingh@progress.com>
|
Kudos, SonarCloud Quality Gate passed!
|
dheerajd-msys
commented
Feb 10, 2023
| @@ -107,7 +107,8 @@ def binary?(filepath) | |||
| # need to check for application/xml explicitly because only versions of | |||
| # libmagic < 5.26 are available on Ubuntu 14.04 and 16.04 which are our | |||
| # CI (Travis and Automate) node platforms | |||
| Utils::FileFormat.get_mime_type(file_path: filepath) !~ %r{^(text\/|inode\/x-empty|application\/xml)} | |||
| # For ubuntu 22.04 we need to include 'application\/json' to match the json file | |||
| Utils::FileFormat.get_mime_type(file_path: filepath) !~ %r{^(text\/|inode\/x-empty|application\/xml|application\/json)} | |||
There was a problem hiding this comment.
In Ubuntu 22.04 MIME TYPE of any json file is being picked up perfectly (as application/json) but not in Ubuntu 20.04 (as text/plain) so we need to include application\/json here in order to decide whether the file passed in this method is binary or not.
saghoshprogress
approved these changes
Feb 10, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
-- Resolved brakeman failure
-- Update nokogiri as required dependency
-- Update regex to match mimetype for ubuntu 22 to match the any json file to resolve spec in ubuntu 22
ON UBUNTU 22.04
3.0.3 :004 > file_path = '/tmp/metadata.json' => "/tmp/metadata.json" 3.0.3 :005 > IO.popen(["file", "--mime-type", "--brief", file_path]) { |io| io.read.chomp } => "application/json" 3.0.3 :006 >ON UBUNTU 20.04
3.0.3 :004 > file_path = '/tmp/metadata.json' => "/tmp/metadata.json" 3.0.3 :005 > IO.popen(["file", "--mime-type", "--brief", file_path]) { |io| io.read.chomp } => "text/plain" 3.0.3 :006 >Issues Resolved
[List any existing issues this PR resolves, or any Discourse or
StackOverflow discussions that are relevant]
Check List