Skip to content

Un-harcode rimage master branch and URL - #3993

Merged
lgirdwood merged 2 commits into
thesofproject:mainfrom
marc-hb:unharcode-rimage-sub
Apr 1, 2021
Merged

Un-harcode rimage master branch and URL#3993
lgirdwood merged 2 commits into
thesofproject:mainfrom
marc-hb:unharcode-rimage-sub

Conversation

@marc-hb

@marc-hbmarc-hb commented Mar 30, 2021

Copy link
Copy Markdown
Collaborator

2 commits, see commit messages

@marc-hb
.gitmodules: use default branch
052610e
No need to hardcode to "master" or anything else, submodules
don't even use branches anyway
Signed-off-by: Marc Herbert <marc.herbert@intel.com>
@marc-hb
marc-hb marked this pull request as ready for review March 30, 2021 18:15
@marc-hb

marc-hb commented Mar 30, 2021

Copy link
Copy Markdown
CollaboratorAuthor

doxygen, testbench and yamllint will hang until #3992 is merged.

@marc-hb
.gitmodules: use a relative path
c6b6d74
Un-hardcoding makes mirroring possible.
Signed-off-by: Marc Herbert <marc.herbert@intel.com>
@marc-hb
marc-hbforce-pushed the unharcode-rimage-sub branch from dbb6438 to c6b6d74CompareMarch 30, 2021 19:41
@marc-hbmarc-hb mentioned this pull request Mar 30, 2021
Merged
@marc-hb

marc-hb commented Mar 31, 2021

Copy link
Copy Markdown
CollaboratorAuthor

The previous https://sof-ci.01.org/sof-pr-viewer/#/build/PR3993/build6239588 on former commit dbb643882d5ff was all green. Newer commit c6b6d74 is identical, it was a fake commit to workaround other, unrelated CI issue (!) #3992

For c6b6d74 github still shows Internal Intel CI System/merge/build Expected — Waiting for status to be reported 10 hours later.

@lgirdwood

lgirdwood commented Mar 31, 2021

Copy link
Copy Markdown
Member

@zrombel are we good to merge here ?

@marc-hb

marc-hb commented Mar 31, 2021

Copy link
Copy Markdown
CollaboratorAuthor

https://sof-ci.01.org/sof-pr-viewer/#/build/PR3993/build6245042 PASSed

The more recent https://sof-ci.01.org/sof-pr-viewer/#/build/PR3993/build6244689 was incomplete for some unknown reason. It did build and use rimage though; it stopped later. So from the selfish perspective of this PR it's also a PASS.

They both ran on the same commit c6b6d74. Quickbuild (and others) test pull/3993/merge so the main branch could have been different. I doubt this mattered.

@marc-hbmarc-hb mentioned this pull request Mar 31, 2021
Merged
@zrombel

zrombel commented Apr 1, 2021

Copy link
Copy Markdown

This PR is good to be merge.
QB have some problem with force-push. I'm already investigating this issue.

@lgirdwood
lgirdwood merged commit 9d78c35 into thesofproject:mainApr 1, 2021
@marc-hb
marc-hb deleted the unharcode-rimage-sub branch April 14, 2021 20:21
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lgirdwoodlgirdwoodlgirdwood approved these changes
@dcpleungdcpleungdcpleung approved these changes
@iuliana-prodaniuliana-prodaniuliana-prodan approved these changes
@dbalutadbalutaAwaiting requested review from dbalutadbaluta is a code owner
@lbetlejlbetlejAwaiting requested review from lbetlejlbetlej is a code owner
@mmaka1mmaka1Awaiting requested review from mmaka1mmaka1 is a code owner
@plbossartplbossartAwaiting requested review from plbossartplbossart is a code owner
@zrombelzrombelAwaiting requested review from zrombel
@aiChaoSONGaiChaoSONGAwaiting requested review from aiChaoSONG
@andyrossandyrossAwaiting requested review from andyross
@fredoh9fredoh9Awaiting requested review from fredoh9
@kv2019ikv2019iAwaiting requested review from kv2019ikv2019i is a code owner
@lyakhlyakhAwaiting requested review from lyakh
@paulstelian97paulstelian97Awaiting requested review from paulstelian97
+1 more reviewer
@cujomalaineycujomalaineycujomalainey approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@marc-hb@lgirdwood@zrombel@cujomalainey@dcpleung@iuliana-prodan