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

Meta: migrate to GitHub Actions #1041

Merged
merged 2 commits into from Jun 13, 2020
Merged

Meta: migrate to GitHub Actions #1041

merged 2 commits into from Jun 13, 2020

Conversation

foolip
Copy link
Member

@foolip foolip commented Jun 12, 2020

Part of whatwg/meta#173.

@foolip
Copy link
Member Author

foolip commented Jun 12, 2020

The first commit from this is using whatwg/spec-factory#16.

@foolip foolip mentioned this pull request Jun 12, 2020
25 tasks
Copy link
Member

@domenic domenic left a comment

Choose a reason for hiding this comment

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

Seems to work great, thanks! Will let you merge and change the branch protection rules.

@foolip
Copy link
Member Author

foolip commented Jun 13, 2020

I'll change the branch protection rules now, then force push this to see it working, then merge and see test and deploy succeed on master.

@foolip foolip merged commit f24f6fc into master Jun 13, 2020
@foolip foolip deleted the github-actions branch June 13, 2020 18:38
@foolip
Copy link
Member Author

foolip commented Jun 13, 2020

Success: https://streams.spec.whatwg.org/
Tests on master too: https://github.com/whatwg/streams/runs/768610769

However, I don't understand why the resulting commit is what it is:

commit f24f6fcd176689d0d6bfa4733771d8ecd86e3584
Author: Philip Jägenstedt <philip@foolip.org>
Date:   Sat Jun 13 20:38:09 2020 +0200

    Merge pull request #1041 from whatwg/github-actions
    
    Meta: migrate to GitHub Actions

It's not a merge commit (phew) but how did this happen? I thought I used the rebase option to preserve both commits. When I merged, I also briefly saw a message about master having changed and the merge failing, before it succeeds.

Seems like something a bit strange happened on the GitHub side here, and the history isn't pretty as a result.

@domenic
Copy link
Member

domenic commented Jun 13, 2020

Hmm. Well, I'd be ok force-pushing to fix things up, unless you think that's likely to backfire.

@foolip
Copy link
Member Author

foolip commented Jun 13, 2020

OK, I've done that, had to disable branch protection temporarily. I only know of two bad things that can happen:

  • People having fetched in the intervening time and not knowing how to recover (not super likely on a Saturday).
  • Tooling that's continuously tracking the master branch and doing something, but aren't prepared for a history rewrite. I've done this sort of thing for other repos, but I don't know why anyone would for a repo like this.

@foolip
Copy link
Member Author

foolip commented Jun 13, 2020

I emailed support@github.com:

I'd like to report a potential bug that I came across in #1041. When I merged this, I think I used "rebase and merge", but possible it was "squash and merge". It wasn't the default option (a real merge commit) because this repo disables that.

As I merged it, I briefly saw an error about the merge failing because the branch had changed. I don't recall the exact wording. That went away and the PR was then merged.

However, the resulting commit was something I've never seen before: #1041 (comment)

This wasn't an actual merge commit, it had just one parent. This wouldn't have resulted from either of the ways of merging that are enabled in this repo.
I hope that you can check if something strange happened in GitHub internals, and happy to provide any help debugging I can.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants