[Intel-gfx] [PATCH 07/10] dim: autodetect branches in rebuild-nightly

Jani Nikula jani.nikula at linux.intel.com
Wed Oct 19 07:10:55 UTC 2016


On Tue, 18 Oct 2016, Daniel Vetter <daniel.vetter at ffwll.ch> wrote:
> On Tue, Oct 18, 2016 at 3:52 PM, Jani Nikula
> <jani.nikula at linux.intel.com> wrote:
>> On Tue, 18 Oct 2016, Daniel Vetter <daniel.vetter at ffwll.ch> wrote:
>>> Needs new url-mapping information in nightly.conf to work properly.
>>
>> I think in the long run the right fix would be to make nightly.conf
>> independent of remote names. Not sure if that's worth the trouble at
>> this point.
>
> It is with this.

I mean, is it worth changing the nightly.conf format at this point to
*not* have remote names at all, but just repo urls and branches. That's
what I think should be done eventually. Because the remote names are
fiction.

BR,
Jani.

> The remote names in nightly.conf are now entirely
> fiction. The magic here takes those, then looks up the corresponding
> url (againg from nigthly.conf) and then uses get_remote_name to figure
> out the appropriate git remote in the local repo. Or complain and quit
> if it doesn't exist. My drm-tip now has an "origin" remote pointing at
> Linus' repo, while the "origin" from nightly.conf gets remapped to
> "drm-tip". Sample output from running rebuild-nightly:
>
> Updating rerere cache and nightly.conf... Done.
> Fetching drm-intel (as danvet) ... Done.
> Fetching drm-upstream (as airlied) ... Done.
> Fetching sound-upstream (as takashi) ... Done.
> Merging drm-intel/drm-intel-fixes... Reset. Done.
> Merging drm-upstream/drm-fixes... Fast-forward. Done.
> Merging drm-intel/drm-intel-next-fixes... Fast-forward. Done.
> ...
>
> Cheers, Daniel

-- 
Jani Nikula, Intel Open Source Technology Center


More information about the dri-devel mailing list