Skip to content

fix PR unable to create with grouped updates #7753

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.

Sign up for GitHub

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

Merged
jakecoffman merged 6 commits into from
Aug 8, 2023
Merged

fix PR unable to create with grouped updates #7753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8d009fd
fix PR unable to create with grouped updates
jakecoffman Aug 7, 2023
755a0a5
fix tests
jakecoffman Aug 7, 2023
8e9ab40
lint
jakecoffman Aug 7, 2023
b545578
fix tests, also more convenient for CLI
jakecoffman Aug 7, 2023
bf35a85
use a default just in case
jakecoffman Aug 7, 2023
46fbab1
Merge branch 'main' into jakecoffman/fix-group-max-length
jakecoffman Aug 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions updater/lib/dependabot/dependency_change.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,29 @@ def initialize(job:, updated_dependencies:, updated_dependency_files:, dependenc
def pr_message
return @pr_message if defined?(@pr_message)

case job.source&.provider
when "github"
pr_message_max_length = Dependabot::PullRequestCreator::Github::PR_DESCRIPTION_MAX_LENGTH
when "azure"
pr_message_max_length = Dependabot::PullRequestCreator::Azure::PR_DESCRIPTION_MAX_LENGTH
pr_message_encoding = Dependabot::PullRequestCreator::Azure::PR_DESCRIPTION_ENCODING
when "codecommit"
pr_message_max_length = Dependabot::PullRequestCreator::Codecommit::PR_DESCRIPTION_MAX_LENGTH
when "bitbucket"
pr_message_max_length = Dependabot::PullRequestCreator::Bitbucket::PR_DESCRIPTION_MAX_LENGTH
else
pr_message_max_length = Dependabot::PullRequestCreator::Github::PR_DESCRIPTION_MAX_LENGTH
end

@pr_message = Dependabot::PullRequestCreator::MessageBuilder.new(
source: job.source,
dependencies: updated_dependencies,
files: updated_dependency_files,
credentials: job.credentials,
commit_message_options: job.commit_message_options,
dependency_group: dependency_group,
pr_message_max_length: pr_message_max_length,
pr_message_encoding: pr_message_encoding,
ignore_conditions: job.ignore_conditions
).message
end
Expand Down
20 changes: 12 additions & 8 deletions updater/spec/dependabot/dependency_change_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,14 @@

describe "#pr_message" do
let(:github_source) do
{
"provider" => "github",
"repo" => "dependabot-fixtures/dependabot-test-ruby-package",
"directory" => "/",
"branch" => nil,
"api-endpoint" => "https://api.github.com/",
"hostname" => "github.com"
}
Dependabot::Source.new(
provider: "github",
repo: "dependabot-fixtures/dependabot-test-ruby-package",
directory: "/",
branch: nil,
api_endpoint: "https://api.github.com/",
hostname: "github.com"
)
end

let(:job_credentials) do
Expand Down Expand Up @@ -101,6 +101,8 @@
credentials: job_credentials,
commit_message_options: commit_message_options,
dependency_group: nil,
pr_message_encoding: nil,
pr_message_max_length: 65_535,
ignore_conditions: []
)

Expand All @@ -126,6 +128,8 @@
credentials: job_credentials,
commit_message_options: commit_message_options,
dependency_group: group,
pr_message_encoding: nil,
pr_message_max_length: 65_535,
ignore_conditions: []
)

Expand Down