Skip to contentSkip to conversation

nightly.conf: Update drm-intel URLs, add missing bare ssh drm-xe URL

PATCH Applied Ryszard Knop 4 participants 5 messages Apr 24, 2024 – May 21, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 nightly.conf: Update drm-intel URLs, add missing bare ssh drm-xe URL

- Switch drm-intel URLs to the new GitLab location.
- Add a short SSH link for drm-xe for completeness with other blocks.
- Add a missing tab in drm_tip_config for column alignment.

---
 nightly.conf | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
nightly.conf +7 -1
index 7ef4249f0c67..2971277b0e25 100644
@@ -30,10 +30,16 @@ 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
 https://gitlab.freedesktop.org/drm/xe/kernel.git
 ssh://[email protected]/drm/xe/kernel.git
 "
 drm_tip_repos[drm-intel]="
[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]="
 ssh://git.freedesktop.org/git/drm/drm-intel
 ssh://git.freedesktop.org/git/drm-intel
 git://anongit.freedesktop.org/drm/drm-intel
@@ -97,6 +103,6 @@ drm_tip_config=(
 	"drm-xe			drm-xe-next"
 
 	"drm-intel		topic/core-for-CI"
-	"drm-xe		topic/xe-for-CI"
+	"drm-xe			topic/xe-for-CI"
 	"drm-intel		topic/thunderbolt-next"
 ) # DO NOT CHANGE THIS LINE
Signature · 1 line
2.44.0
#1 lore raw

✗ Fi.CI.BUILD: failure for nightly.conf: Update drm-intel URLs, add missing bare ssh drm-xe URL

== Series Details ==

== Series Details ==

Series: nightly.conf: Update drm-intel URLs, add missing bare ssh drm-xe URL
URL : https://patchwork.freedesktop.org/series/132841/
State : failure

== Summary ==

Error: patch https://patchwork.freedesktop.org/api/1.0/series/132841/revisions/1/mbox/ not applied
Applying: nightly.conf: Update drm-intel URLs, add missing bare ssh drm-xe URL
error: sha1 information is lacking or useless (nightly.conf).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 nightly.conf: Update drm-intel URLs, add missing bare ssh drm-xe URL When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Build failed, no error log produced

Acked-by on v1 1/1
#2 lore raw
In reply to Ryszard Knop
Quoted 5 lines · Ryszard Knop

- Switch drm-intel URLs to the new GitLab location.
- Add a short SSH link for drm-xe for completeness with other blocks.
- Add a missing tab in drm_tip_config for column alignment.

Quoted 33 lines
---
 nightly.conf | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
nightly.conf +7 -1
index 7ef4249f0c67..2971277b0e25 100644
@@ -30,10 +30,16 @@ 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
 https://gitlab.freedesktop.org/drm/xe/kernel.git
 ssh://[email protected]/drm/xe/kernel.git
 "
 drm_tip_repos[drm-intel]="
[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]="
 ssh://git.freedesktop.org/git/drm/drm-intel
 ssh://git.freedesktop.org/git/drm-intel
 git://anongit.freedesktop.org/drm/drm-intel
@@ -97,6 +103,6 @@ drm_tip_config=(
 	"drm-xe			drm-xe-next"
 
 	"drm-intel		topic/core-for-CI"
-	"drm-xe		topic/xe-for-CI"
+	"drm-xe			topic/xe-for-CI"
 	"drm-intel		topic/thunderbolt-next"
 ) # DO NOT CHANGE THIS LINE
Signature · 1 line
Jani Nikula, Intel
Acked-by on v1 1/1
#3 lore raw
In reply to Ryszard Knop
Quoted 15 lines · Ryszard Knop

- Switch drm-intel URLs to the new GitLab location.
- Add a short SSH link for drm-xe for completeness with other blocks.
- Add a missing tab in drm_tip_config for column alignment.

---
nightly.conf | 8 +++++++-

1 file changed, 7 insertions(+), 1 deletion(-)
nightly.conf +0 -0
index 7ef4249f0c67..2971277b0e25 100644
@@ -30,10 +30,16 @@ https://anongit.freedesktop.org/git/drm/drm-tip

https://anongit.freedesktop.org/git/drm/drm-tip.git

Quoted 8 lines

"
drm_tip_repos[drm-xe]=" [email protected]:drm/xe/kernel.git
https://gitlab.freedesktop.org/drm/xe/kernel.git
ssh://[email protected]/drm/xe/kernel.git "
drm_tip_repos[drm-intel]=" [email protected]:drm/i915/kernel.git

we probably need to update dim so pick_protocol_url knows this is an ssh remote. I think it's harmless right now as if there's no chosen protocol, it will use the first (git@... in this case). If a protocol is chosen, it will use one of the urls with protocol in it. We'd have a problem if there was only this form for ssh remote.

Lucas De Marchi

Quoted 18 lines
nightly.conf +4 -0
+https://gitlab.freedesktop.org/drm/i915/kernel.git
+ssh://[email protected]/drm/i915/kernel.git
+"
+drm_old_urls[drm-intel]="

ssh://git.freedesktop.org/git/drm/drm-intel
ssh://git.freedesktop.org/git/drm-intel
git://anongit.freedesktop.org/drm/drm-intel

nightly.conf +1 -1
@@ -97,6 +103,6 @@ drm_tip_config=(
 	"drm-xe			drm-xe-next"
 
 	"drm-intel		topic/core-for-CI"
-	"drm-xe		topic/xe-for-CI"
+	"drm-xe			topic/xe-for-CI"
 	"drm-intel		topic/thunderbolt-next"

) # DO NOT CHANGE THIS LINE

Signature · 1 line
2.44.0