dim has supported picking up the first match from a list of urls since
61df7dc31c63 ("dim: allow a space separated list of URLs for each repo
in drm_tip_repos"). This way we don't have to have a complicated set of
rules for converting between ssh, git and https protocol URLs, and we
can configure the preferred URLs with /drm/ in them while retaining
backwards compatibility for URLs without /drm/.
https://cgit.freedesktop.org/ does not list https:// URLs for drm-amd or
drm-upstream, so don't add them yet.
Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
---
nightly.conf | 41 ++++++++++++++++++++++++++++++++++-------
1 file changed, 34 insertions(+), 7 deletions(-)
diff --git a/nightly.conf b/nightly.conf
index d2bcd3ebec53..b826c9c194d2 100644
--- a/nightly.conf
+++ b/nightly.conf
@@ -1,18 +1,45 @@
-# drm-intel-nightly configuration
+# drm-tip configuration
#
# sourced as a bash script from dim
#
-# drm-tip <repo> to <url> associative array (declared in dim)
+# drm-tip <repo> to <url list> associative array (declared in dim)
#
# <repo> (the key) is a symbolic name used for drm_tip_config, must match
# [a-z-]+
#
-drm_tip_repos[drm-intel]="ssh://git.freedesktop.org/git/drm-intel"
-drm_tip_repos[drm-misc]="ssh://git.freedesktop.org/git/drm-misc"
-drm_tip_repos[drm-amd]="ssh://git.freedesktop.org/git/drm/drm-amd"
-drm_tip_repos[drm-upstream]="git://people.freedesktop.org/~airlied/linux"
-drm_tip_repos[sound-upstream]="git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git"
+# <url list> (the value) is a space separated list of accepted URLs in order of
+# preference
+#
+# dim users may freely choose the remote names and URLs from this list.
+#
+drm_tip_repos[drm-intel]="
+ssh://git.freedesktop.org/git/drm/drm-intel
+ssh://git.freedesktop.org/git/drm-intel
+git://anongit.freedesktop.org/drm/drm-intel
+git://anongit.freedesktop.org/drm-intel
+https://anongit.freedesktop.org/git/drm/drm-intel.git
+"
+drm_tip_repos[drm-misc]="
+ssh://git.freedesktop.org/git/drm/drm-misc
+ssh://git.freedesktop.org/git/drm-misc
+git://anongit.freedesktop.org/drm/drm-misc
+git://anongit.freedesktop.org/drm-misc
+https://anongit.freedesktop.org/git/drm/drm-misc.git
+"
+drm_tip_repos[drm-amd]="
+ssh://git.freedesktop.org/git/drm/drm-amd
+git://anongit.freedesktop.org/drm/drm-amd
+"
+drm_tip_repos[drm-upstream]="
+ssh://people.freedesktop.org/~airlied/linux
+git://people.freedesktop.org/~airlied/linux
+"
+drm_tip_repos[sound-upstream]="
+git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
+https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
+https://kernel.googlesource.com/pub/scm/linux/kernel/git/tiwai/sound.git
+"
#
# drm-tip branch configuration array (declared in dim)
--
2.11.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
