| Message ID | 20250408134635.43488-1-lucas.demarchi@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [drm-rerere] nightly.conf: Update to ssh.gitlab.freedesktop.org | expand |
On Tue, 08 Apr 2025, Lucas De Marchi <lucas.demarchi@intel.com> wrote: > 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://git@ssh.gitlab.freedesktop.org/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. > > Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> Thanks for doing this! Reviewed-by: Jani Nikula <jani.nikula@intel.com> Tested-by: Jani Nikula <jani.nikula@intel.com> > --- > nightly.conf | 25 ++++++++++++++++--------- > 1 file changed, 16 insertions(+), 9 deletions(-) > > diff --git a/nightly.conf b/nightly.conf > index 49abf3fb2a727..17961b5cb4e47 100644 > --- a/nightly.conf > +++ b/nightly.conf > @@ -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]=" > -git@gitlab.freedesktop.org:drm/tip.git > +ssh://git@ssh.gitlab.freedesktop.org/drm/tip.git > https://gitlab.freedesktop.org/drm/tip.git > -ssh://git@gitlab.freedesktop.org/drm/tip.git > " > drm_old_urls[drm-tip]=" > +git@gitlab.freedesktop.org:drm/tip.git > +ssh://git@gitlab.freedesktop.org/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]=" > -git@gitlab.freedesktop.org:drm/xe/kernel.git > +ssh://git@ssh.gitlab.freedesktop.org/drm/xe/kernel.git > https://gitlab.freedesktop.org/drm/xe/kernel.git > +" > +drm_old_urls[drm-xe]=" > +git@gitlab.freedesktop.org:drm/xe/kernel.git > ssh://git@gitlab.freedesktop.org/drm/xe/kernel.git > " > drm_tip_repos[drm-intel]=" > -git@gitlab.freedesktop.org:drm/i915/kernel.git > +ssh://git@ssh.gitlab.freedesktop.org/drm/i915/kernel.git > https://gitlab.freedesktop.org/drm/i915/kernel.git > -ssh://git@gitlab.freedesktop.org/drm/i915/kernel.git > " > drm_old_urls[drm-intel]=" > +git@gitlab.freedesktop.org:drm/i915/kernel.git > +ssh://git@gitlab.freedesktop.org/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]=" > -git@gitlab.freedesktop.org:drm/misc/kernel.git > +ssh://git@ssh.gitlab.freedesktop.org/drm/misc/kernel.git > https://gitlab.freedesktop.org/drm/misc/kernel.git > -ssh://git@gitlab.freedesktop.org/drm/misc/kernel.git > " > drm_old_urls[drm-misc]=" > +git@gitlab.freedesktop.org:drm/misc/kernel.git > +ssh://git@gitlab.freedesktop.org/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]=" > -git@gitlab.freedesktop.org:drm/kernel.git > +ssh://git@ssh.gitlab.freedesktop.org/drm/kernel.git > https://gitlab.freedesktop.org/drm/kernel.git > -ssh://git@gitlab.freedesktop.org/drm/kernel.git > " > drm_old_urls[drm]=" > +git@gitlab.freedesktop.org:drm/kernel.git > +ssh://git@gitlab.freedesktop.org/drm/kernel.git > ssh://git.freedesktop.org/git/drm/drm > git://anongit.freedesktop.org/drm/drm > https://anongit.freedesktop.org/git/drm/drm
diff --git a/nightly.conf b/nightly.conf index 49abf3fb2a727..17961b5cb4e47 100644 --- a/nightly.conf +++ b/nightly.conf @@ -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]=" -git@gitlab.freedesktop.org:drm/tip.git +ssh://git@ssh.gitlab.freedesktop.org/drm/tip.git https://gitlab.freedesktop.org/drm/tip.git -ssh://git@gitlab.freedesktop.org/drm/tip.git " drm_old_urls[drm-tip]=" +git@gitlab.freedesktop.org:drm/tip.git +ssh://git@gitlab.freedesktop.org/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]=" -git@gitlab.freedesktop.org:drm/xe/kernel.git +ssh://git@ssh.gitlab.freedesktop.org/drm/xe/kernel.git https://gitlab.freedesktop.org/drm/xe/kernel.git +" +drm_old_urls[drm-xe]=" +git@gitlab.freedesktop.org:drm/xe/kernel.git ssh://git@gitlab.freedesktop.org/drm/xe/kernel.git " drm_tip_repos[drm-intel]=" -git@gitlab.freedesktop.org:drm/i915/kernel.git +ssh://git@ssh.gitlab.freedesktop.org/drm/i915/kernel.git https://gitlab.freedesktop.org/drm/i915/kernel.git -ssh://git@gitlab.freedesktop.org/drm/i915/kernel.git " drm_old_urls[drm-intel]=" +git@gitlab.freedesktop.org:drm/i915/kernel.git +ssh://git@gitlab.freedesktop.org/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]=" -git@gitlab.freedesktop.org:drm/misc/kernel.git +ssh://git@ssh.gitlab.freedesktop.org/drm/misc/kernel.git https://gitlab.freedesktop.org/drm/misc/kernel.git -ssh://git@gitlab.freedesktop.org/drm/misc/kernel.git " drm_old_urls[drm-misc]=" +git@gitlab.freedesktop.org:drm/misc/kernel.git +ssh://git@gitlab.freedesktop.org/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]=" -git@gitlab.freedesktop.org:drm/kernel.git +ssh://git@ssh.gitlab.freedesktop.org/drm/kernel.git https://gitlab.freedesktop.org/drm/kernel.git -ssh://git@gitlab.freedesktop.org/drm/kernel.git " drm_old_urls[drm]=" +git@gitlab.freedesktop.org:drm/kernel.git +ssh://git@gitlab.freedesktop.org/drm/kernel.git ssh://git.freedesktop.org/git/drm/drm git://anongit.freedesktop.org/drm/drm https://anongit.freedesktop.org/git/drm/drm
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://git@ssh.gitlab.freedesktop.org/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. Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> --- nightly.conf | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-)