admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

utils/github.rb: convert pr to integer

Browse Source 
Follow up adter #13124

I made the choice to convert the pr variable to an integer
at the very end and adjust the tests.

It would be maybe more consistent to work with an integer
everywhere, but this needs a more careful analysis and we
are in a hurry to fix the homberew-core upload CI

Fixes:
2022-04-11T20:19:34.1395885Z [31mError:[0m : Variable $pr of type Int! was provided invalid value
2022-04-11T20:19:34.1398279Z /home/linuxbrew/.linuxbrew/Homebrew/Library/Homebrew/utils/github/api.rb:261:in `open_graphql'
2022-04-11T20:19:34.1399774Z /home/linuxbrew/.linuxbrew/Homebrew/Library/Homebrew/utils/github.rb:310:in `get_workflow_run'
2022-04-11T20:19:34.1403699Z /home/linuxbrew/.linuxbrew/Homebrew/Library/Homebrew/dev-cmd/pr-pull.rb:418:in `block (4 levels) in pr_pull'
2022-04-11T20:19:34.1405233Z /home/linuxbrew/.linuxbrew/Homebrew/Library/Homebrew/dev-cmd/pr-pull.rb:417:in `each'
2022-04-11T20:19:34.1406723Z /home/linuxbrew/.linuxbrew/Homebrew/Library/Homebrew/dev-cmd/pr-pull.rb:417:in `block (3 levels) in pr_pull'
2022-04-11T20:19:34.1408112Z /home/linuxbrew/.linuxbrew/Homebrew/Library/Homebrew/vendor/portable-ruby/2.6.8/lib/ruby/2.6.0/fileutils.rb:128:in `chdir'
2022-04-11T20:19:34.1408986Z /home/linuxbrew/.linuxbrew/Homebrew/Library/Homebrew/vendor/portable-ruby/2.6.8/lib/ruby/2.6.0/fileutils.rb:128:in `cd'
2022-04-11T20:19:34.1409813Z /home/linuxbrew/.linuxbrew/Homebrew/Library/Homebrew/dev-cmd/pr-pull.rb:400:in `block (2 levels) in pr_pull'
2022-04-11T20:19:34.1410671Z /home/linuxbrew/.linuxbrew/Homebrew/Library/Homebrew/vendor/portable-ruby/2.6.8/lib/ruby/2.6.0/tmpdir.rb:93:in `mktmpdir'
2022-04-11T20:19:34.1411495Z /home/linuxbrew/.linuxbrew/Homebrew/Library/Homebrew/dev-cmd/pr-pull.rb:399:in `block in pr_pull'
2022-04-11T20:19:34.1412250Z /home/linuxbrew/.linuxbrew/Homebrew/Library/Homebrew/dev-cmd/pr-pull.rb:388:in `each'
2022-04-11T20:19:34.1413056Z /home/linuxbrew/.linuxbrew/Homebrew/Library/Homebrew/dev-cmd/pr-pull.rb:388:in `pr_pull'
This commit is contained in:
Michka Popoff 2022-04-11 22:36:42 +02:00
parent e5e02f8705
commit a5c29fff2d
No known key found for this signature in database
GPG Key ID: 033D03F151030611
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Library/Homebrew/test/utils/github_spec.rb
View File

@ -69,7 +69,7 @@ describe GitHub do
it "fails to find a nonexistent workflow" do it "fails to find a nonexistent workflow" do
expect { expect {
described_class.get_artifact_url( described_class.get_artifact_url(
described_class.get_workflow_run("Homebrew", "homebrew-core", 1), described_class.get_workflow_run("Homebrew", "homebrew-core", "1"),
) )
}.to raise_error(/No matching check suite found/) }.to raise_error(/No matching check suite found/)
end end
@ -77,14 +77,14 @@ describe GitHub do
it "fails to find artifacts that don't exist" do it "fails to find artifacts that don't exist" do
expect { expect {
described_class.get_artifact_url( described_class.get_artifact_url(
described_class.get_workflow_run("Homebrew", "homebrew-core", 79751, artifact_name: "false_bottles"), described_class.get_workflow_run("Homebrew", "homebrew-core", "79751", artifact_name: "false_bottles"),
) )
}.to raise_error(/No artifact .+ was found/) }.to raise_error(/No artifact .+ was found/)
end end
it "gets an artifact link" do it "gets an artifact link" do
url = described_class.get_artifact_url( url = described_class.get_artifact_url(
described_class.get_workflow_run("Homebrew", "homebrew-core", 79751, artifact_name: "bottles"), described_class.get_workflow_run("Homebrew", "homebrew-core", "79751", artifact_name: "bottles"),
) )
expect(url).to eq("https://api.github.com/repos/Homebrew/homebrew-core/actions/artifacts/70494047/zip") expect(url).to eq("https://api.github.com/repos/Homebrew/homebrew-core/actions/artifacts/70494047/zip")
end end

2
Library/Homebrew/utils/github.rb
View File

@ -305,7 +305,7 @@ module GitHub
variables = { variables = {
user: user, user: user,
repo: repo, repo: repo,
pr: pr, pr: pr.to_i,
} }
result = API.open_graphql(query, variables: variables, scopes: scopes) result = API.open_graphql(query, variables: variables, scopes: scopes)