Skip to content

Conversation

@marc-hb
Copy link
Collaborator

@marc-hb marc-hb commented Mar 30, 2021

Will hopefully fix mysterious CI hangs.

Signed-off-by: Marc Herbert [email protected]

Will hopefully fix mysterious CI hangs.

Signed-off-by: Marc Herbert <[email protected]>
@marc-hb marc-hb mentioned this pull request Mar 30, 2021
@marc-hb marc-hb marked this pull request as ready for review March 30, 2021 18:03
@marc-hb marc-hb requested review from aiChaoSONG and fredoh9 March 30, 2021 18:04
@cujomalainey
Copy link
Contributor

CI recovered in this PR, expediting due to impact.

@cujomalainey cujomalainey merged commit d7c8ccc into thesofproject:main Mar 30, 2021
@cujomalainey
Copy link
Contributor

Looks like everyone has to rebase on top of this PR to get the fix. I re-ran a PR and it didn't pick up the change. I rebased #3974 and that seems to have fixed it, @marc-hb can you confirm and put out a PSA on sof-dev group?

@marc-hb marc-hb deleted the gh-pr-main branch March 30, 2021 19:28
@marc-hb
Copy link
Collaborator Author

marc-hb commented Mar 30, 2021

Looks like everyone has to rebase on top of this PR to get the fix.

Examples?

I'm surprised you have to actually rebase because by default github actions (and our Jenkins and likely others) test pull/12345/merge which includes the latest tip (as opposed to pull/12345/head that does not). So a fake commit --amend + force push to merely change the git SHA should be enough. Maybe some github button in the web UI is enough. Let me try.

@cujomalainey
Copy link
Contributor

Likely that would work too, rebase just seemed easier

@marc-hb
Copy link
Collaborator Author

marc-hb commented Mar 30, 2021

So a fake commit --amend + force push to merely change the git SHA should be enough. Let me try.

Confirmed with (unrelated) #3993 .

Of course rebasing works too but that creates useless git range-diff noise. Useless because CI tests pull/12345/merge anyway.

Maybe some github button in the web UI is enough. Let me try.

Found nothing there unfortunately.

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