Skip to contentSkip to conversation

nightly.conf: Update to ssh.gitlab.freedesktop.org

PATCH In review Lucas De Marchi 2 participants 2 messages Apr 8, 2025

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 nightly.conf: Update to ssh.gitlab.freedesktop.org

Add the old url to the old array, and the new one. This will prompt the user with the following message when dim updated-branches is called:

Update drm to new ssh://[email protected]/drm/kernel.git? (y/N)

... for each repository it's changing. After that, git should be configured with the new repositories.

Note that we are taking the opportunity to be explicit on the protocol, adding the ssh:// and dropping the entry without it. It's clearer and less entries to maintain.

---
 nightly.conf | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)
nightly.conf +16 -9
index 49abf3fb2a727..17961b5cb4e47 100644
@@ -17,11 +17,12 @@ DIM_MIN_VERSION=1
 # dim users may freely choose the remote names and URLs from this list.
 #
 drm_tip_repos[drm-tip]="
[email protected]:drm/tip.git
+ssh://[email protected]/drm/tip.git
 https://gitlab.freedesktop.org/drm/tip.git
-ssh://[email protected]/drm/tip.git
 "
 drm_old_urls[drm-tip]="
[email protected]:drm/tip.git
+ssh://[email protected]/drm/tip.git
 ssh://git.freedesktop.org/git/drm/drm-tip
 ssh://git.freedesktop.org/git/drm-tip
 git://anongit.freedesktop.org/drm/drm-tip
@@ -30,16 +31,20 @@ https://anongit.freedesktop.org/git/drm/drm-tip
 https://anongit.freedesktop.org/git/drm/drm-tip.git
 "
 drm_tip_repos[drm-xe]="
[email protected]:drm/xe/kernel.git
+ssh://[email protected]/drm/xe/kernel.git
 https://gitlab.freedesktop.org/drm/xe/kernel.git
+"
+drm_old_urls[drm-xe]="
[email protected]:drm/xe/kernel.git
 ssh://[email protected]/drm/xe/kernel.git
 "
 drm_tip_repos[drm-intel]="
[email protected]:drm/i915/kernel.git
+ssh://[email protected]/drm/i915/kernel.git
 https://gitlab.freedesktop.org/drm/i915/kernel.git
-ssh://[email protected]/drm/i915/kernel.git
 "
 drm_old_urls[drm-intel]="
[email protected]:drm/i915/kernel.git
+ssh://[email protected]/drm/i915/kernel.git
 ssh://git.freedesktop.org/git/drm/drm-intel
 ssh://git.freedesktop.org/git/drm-intel
 git://anongit.freedesktop.org/drm/drm-intel
@@ -48,11 +53,12 @@ https://anongit.freedesktop.org/git/drm/drm-intel
 https://anongit.freedesktop.org/git/drm/drm-intel.git
 "
 drm_tip_repos[drm-misc]="
[email protected]:drm/misc/kernel.git
+ssh://[email protected]/drm/misc/kernel.git
 https://gitlab.freedesktop.org/drm/misc/kernel.git
-ssh://[email protected]/drm/misc/kernel.git
 "
 drm_old_urls[drm-misc]="
[email protected]:drm/misc/kernel.git
+ssh://[email protected]/drm/misc/kernel.git
 ssh://git.freedesktop.org/git/drm/drm-misc
 ssh://git.freedesktop.org/git/drm-misc
 git://anongit.freedesktop.org/drm/drm-misc
@@ -61,11 +67,12 @@ https://anongit.freedesktop.org/git/drm/drm-misc
 https://anongit.freedesktop.org/git/drm/drm-misc.git
 "
 drm_tip_repos[drm]="
[email protected]:drm/kernel.git
+ssh://[email protected]/drm/kernel.git
 https://gitlab.freedesktop.org/drm/kernel.git
-ssh://[email protected]/drm/kernel.git
 "
 drm_old_urls[drm]="
[email protected]:drm/kernel.git
+ssh://[email protected]/drm/kernel.git
 ssh://git.freedesktop.org/git/drm/drm
 git://anongit.freedesktop.org/drm/drm
 https://anongit.freedesktop.org/git/drm/drm
Signature · 1 line
2.49.0
Reviewed-by Tested-by on v1 1/1
#1 lore raw
Quoted 5 lines · Lucas De Marchi

Add the old url to the old array, and the new one. This will prompt the user with the following message when dim updated-branches is called:

Update drm to new ssh://[email protected]/drm/kernel.git? (y/N)

Quoted 8 lines

... for each repository it's changing. After that, git should be configured with the new repositories.

Note that we are taking the opportunity to be explicit on the protocol, adding the ssh:// and dropping the entry without it. It's clearer and less entries to maintain.

Thanks for doing this!

Quoted 77 lines
---
 nightly.conf | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)
nightly.conf +16 -9
index 49abf3fb2a727..17961b5cb4e47 100644
@@ -17,11 +17,12 @@ DIM_MIN_VERSION=1
 # dim users may freely choose the remote names and URLs from this list.
 #
 drm_tip_repos[drm-tip]="
[email protected]:drm/tip.git
+ssh://[email protected]/drm/tip.git
 https://gitlab.freedesktop.org/drm/tip.git
-ssh://[email protected]/drm/tip.git
 "
 drm_old_urls[drm-tip]="
[email protected]:drm/tip.git
+ssh://[email protected]/drm/tip.git
 ssh://git.freedesktop.org/git/drm/drm-tip
 ssh://git.freedesktop.org/git/drm-tip
 git://anongit.freedesktop.org/drm/drm-tip
@@ -30,16 +31,20 @@ https://anongit.freedesktop.org/git/drm/drm-tip
 https://anongit.freedesktop.org/git/drm/drm-tip.git
 "
 drm_tip_repos[drm-xe]="
[email protected]:drm/xe/kernel.git
+ssh://[email protected]/drm/xe/kernel.git
 https://gitlab.freedesktop.org/drm/xe/kernel.git
+"
+drm_old_urls[drm-xe]="
[email protected]:drm/xe/kernel.git
 ssh://[email protected]/drm/xe/kernel.git
 "
 drm_tip_repos[drm-intel]="
[email protected]:drm/i915/kernel.git
+ssh://[email protected]/drm/i915/kernel.git
 https://gitlab.freedesktop.org/drm/i915/kernel.git
-ssh://[email protected]/drm/i915/kernel.git
 "
 drm_old_urls[drm-intel]="
[email protected]:drm/i915/kernel.git
+ssh://[email protected]/drm/i915/kernel.git
 ssh://git.freedesktop.org/git/drm/drm-intel
 ssh://git.freedesktop.org/git/drm-intel
 git://anongit.freedesktop.org/drm/drm-intel
@@ -48,11 +53,12 @@ https://anongit.freedesktop.org/git/drm/drm-intel
 https://anongit.freedesktop.org/git/drm/drm-intel.git
 "
 drm_tip_repos[drm-misc]="
[email protected]:drm/misc/kernel.git
+ssh://[email protected]/drm/misc/kernel.git
 https://gitlab.freedesktop.org/drm/misc/kernel.git
-ssh://[email protected]/drm/misc/kernel.git
 "
 drm_old_urls[drm-misc]="
[email protected]:drm/misc/kernel.git
+ssh://[email protected]/drm/misc/kernel.git
 ssh://git.freedesktop.org/git/drm/drm-misc
 ssh://git.freedesktop.org/git/drm-misc
 git://anongit.freedesktop.org/drm/drm-misc
@@ -61,11 +67,12 @@ https://anongit.freedesktop.org/git/drm/drm-misc
 https://anongit.freedesktop.org/git/drm/drm-misc.git
 "
 drm_tip_repos[drm]="
[email protected]:drm/kernel.git
+ssh://[email protected]/drm/kernel.git
 https://gitlab.freedesktop.org/drm/kernel.git
-ssh://[email protected]/drm/kernel.git
 "
 drm_old_urls[drm]="
[email protected]:drm/kernel.git
+ssh://[email protected]/drm/kernel.git
 ssh://git.freedesktop.org/git/drm/drm
 git://anongit.freedesktop.org/drm/drm
 https://anongit.freedesktop.org/git/drm/drm
Signature · 1 line
Jani Nikula, Intel