Githawk: Merge pull request 404s

[BasThomas]

https://github.com/tryswift/trySwiftAppFinal/issues/60

[BasThomas]

So I am getting a 404.
This is the URL: "https://api.github.com/repos/tryswift/trySwiftAppFinal/pulls/62/merge"

JSON response:

▿ 2 elements
  ▿ 0 : 2 elements
    - key : message
    - value : Not Found
  ▿ 1 : 2 elements
    - key : documentation_url
    - value : https://developer.github.com/v3/pulls/#merge-a-pull-request-merge-button

and a nil error. Can't figure out what's going wrong on our end. 😕

[jdisho]

What is the request body? 😕

[BasThomas]

This is V3 so there is none

[jdisho]

Should't this be part of the body?

[BasThomas]

Oops, of course - you're absolutely right.

I merged the pull request earlier, but I am pretty sure we only provide the merge_method, which, in my case, was merge - set explicitly.

[jdisho]

Does it work now @BasThomas ?

_{Sent with GitHawk}

[BasThomas]

I guess not? Not sure
(Checked: no)

[rnystrom]

@BasThomas any progress on this?

[BasThomas]

Not yet

[BasThomas]

Still failing as of today 😐

[BasThomas]

OK so the documentation is pretty bad here, but it seems like we need to provide a SHA "that pull request head must match".

We do not do that. Here's the parameters we send:

(lldb) po parameters
▿ Optional<Dictionary<String, Any>>
  ▿ some : 2 elements
    ▿ 0 : 2 elements
      - key : "merge_method"
      - value : "merge"
    ▿ 1 : 2 elements
      - key : "access_token"
      - value : "xyz"

Anyone that wants to pick this up?

I don't directly see how we'd get this SHA, but we'd want to add this to the parameters here.

[rnystrom]

@BasThomas is there a chance you’re trying to merge with a strategy (rebase/squash/merge) not allowed by the repo?

_{Sent with GitHawk}

[rnystrom]

The SHA part doesn’t seem right because that doesn’t explain why it works in other repos...

_{Sent with GitHawk}

[BasThomas]

Could be! It was Swift Weekly Brief; I think we squash by default. Will check!

_{Sent with GitHawk}

[rnystrom]

I’ve been meaning to log that as an issue. I haven’t seen a way to restrict the merge options yet. If anything if this response returns 404 the error should say “can’t merge with x”

_{Sent with GitHawk}

[rnystrom]

They did add the API! Putting up a PR now. I'm so glad this is a thing now!