Skip to content

Rebase 2020/01/25 #33

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

Conversation

kateinoigakukun
Copy link
Member

Replace this paragraph with a description of your changes and rationale. Provide links to external references/discussions if appropriate.

Resolves SR-NNNN.

@MaxDesiatov
Copy link

Not sure why CI wasn't triggered here 🤔

@kateinoigakukun
Copy link
Member Author

kateinoigakukun commented Jan 26, 2020

Hmm, I can't figure out the reason too 🤔
But passed on my forked repo https://github.com/kateinoigakukun/swiftwasm/runs/408402915

@kateinoigakukun
Copy link
Member Author

kateinoigakukun commented Jan 26, 2020

@MaxDesiatov BTW I'm thinking to change the strategy of tracking upstream changes because rebasing branch is very hard and likely causes big conflict.
I know merge commit makes the commit history redundant, but rebasing operation takes more cost. So I'm trying to use pull Github App which creates merge pull request when upstream branch updated like this.

This strategy makes conflict as small as possible and more safely because we don't have to use force-push to swiftwasm branch.

What do you think about this?

@MaxDesiatov
Copy link

@kateinoigakukun this makes sense, fine by me 🙂

@MaxDesiatov
Copy link

Why GitHub Actions does not run for PRs made from this branch is still a mystery to me 🤨

@karwa
Copy link

karwa commented Jan 26, 2020

One thing that might be worthwhile is to squash many of the earlier changes. There used to be lots of hacks that have since been removed, etc. In fact, the total diff required to get this port working isn't very big or hard to maintain (mostly new files or adding a few lines for wasi here and there).

@MaxDesiatov
Copy link

MaxDesiatov commented Jan 26, 2020

I agree, I'm also trying to upstream as much of it as possible in small PRs in the next few weeks, which should make the total diff even smaller after those are merged.

@kateinoigakukun
Copy link
Member Author

kateinoigakukun commented Jan 29, 2020

Now, I'm tracking apple/master branch here https://github.com/kateinoigakukun/swiftwasm/tree/swiftwasm

I'll clone this pr and could you force-push this? @MaxDesiatov

I hope this is final force-push.

@MaxDesiatov
Copy link

cool, that's done now ✅

@kateinoigakukun
Copy link
Member Author

@MaxDesiatov Thanks!

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

Successfully merging this pull request may close these issues.

3 participants