Skip to content
Snippets Groups Projects
Select Git revision
0 results
Search by author
  • Any Author
0 authors
  1. Nov 08, 2016
    • Jani Nikula's avatar
      dim: switch to using remote agnostic integration branch config · 12976ee3
      Jani Nikula authored 
      
NOTE: This change depends on the nightly.conf commit 0d0e6d4e7dcc
("nightly.conf: prepare for remote agnostic configuration") in the
rerere-cache branch of the drm-intel repo. Looking at that first makes
this change more sensible.

Use two arrays to configure the repos and branches to be merged to the
integration branch:

drm_tip_repos

	An associative array that maps repo names to urls. This is
	mostly a convenience for defining the other array. The repo
	names are symbolic, and not related to actual git remote names.
	It's also helpful for implementing dim create-branch and
	remove-branch.

drm_tip_config

	An array of strings which describes the repos and branches to be
	used to generate the integration branch. The repos are listed
	using the symbolic repo names from the drm_tip_repos array. It's
	also possible to list an override sha, in case there's a need to
	hold back updating to the tip of the branch for some reason.

dim as a whole still remains dependent on specific (and configured)
remote names, but this change detaches nightly.conf from the remote
names.

Acked-by: default avatarDaniel Vetter <daniel@ffwll.ch>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
      12976ee3
    • Jani Nikula's avatar
      dim: add a variable for nightly.conf · 2e182dee
      Jani Nikula authored 
      
We'll change the name at some point, add some indirection, with a
generic variable name.

Acked-by: default avatarDaniel Vetter <daniel@ffwll.ch>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
      2e182dee
  3. Oct 28, 2016
  5. Oct 27, 2016
  7. Oct 26, 2016
  9. Oct 11, 2016
  11. Sep 30, 2016
  13. Sep 26, 2016
  15. Sep 23, 2016
  17. Aug 29, 2016
  19. Aug 23, 2016
  21. Jul 20, 2016
  23. Jul 19, 2016
  25. Jul 11, 2016
  27. May 10, 2016
  29. Apr 20, 2016
  31. Apr 19, 2016
  33. Mar 30, 2016
  35. Mar 23, 2016
    • Simona Vetter's avatar
      dim: Teach fixes subcmd about Cc: stable/-fixes · 7c923e89
      Simona Vetter authored 
      
It's explained in the rules, but tricky. Let's use computers to get it
right ;-)

Note that Cc: drm-intel-fixes has a few false positives since the
script can't predict when exactly the feature cutoff is going to be.
But that's better than losing a few bugfixes.

Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Imre Deak <imre.deak@intel.com>
Acked-by: default avatarImre Deak <imre.deak@intel.com>
      7c923e89
  37. Mar 22, 2016
  39. Mar 21, 2016
  41. Mar 16, 2016