* ✗ Fi.CI.BUILD: failure for nightly.conf: Update drm-intel URLs, add missing bare ssh drm-xe URL
2024-04-24 11:32 [PATCH] nightly.conf: Update drm-intel URLs, add missing bare ssh drm-xe URL Ryszard Knop
@ 2024-04-24 11:41 ` Patchwork
2024-04-24 12:48 ` [PATCH] " Jani Nikula
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2024-04-24 11:41 UTC (permalink / raw)
To: Ryszard Knop; +Cc: intel-gfx
== 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
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] nightly.conf: Update drm-intel URLs, add missing bare ssh drm-xe URL
2024-04-24 11:32 [PATCH] nightly.conf: Update drm-intel URLs, add missing bare ssh drm-xe URL Ryszard Knop
2024-04-24 11:41 ` ✗ Fi.CI.BUILD: failure for " Patchwork
@ 2024-04-24 12:48 ` Jani Nikula
2024-04-24 13:23 ` Lucas De Marchi
2024-05-21 14:29 ` Lucas De Marchi
3 siblings, 0 replies; 5+ messages in thread
From: Jani Nikula @ 2024-04-24 12:48 UTC (permalink / raw)
To: Ryszard Knop, dri-devel, intel-gfx
On Wed, 24 Apr 2024, Ryszard Knop <ryszard.knop@intel.com> wrote:
> - 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.
>
> Signed-off-by: Ryszard Knop <ryszard.knop@intel.com>
Acked-by: Jani Nikula <jani.nikula@intel.com>
> ---
> nightly.conf | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/nightly.conf b/nightly.conf
> index 7ef4249f0c67..2971277b0e25 100644
> --- a/nightly.conf
> +++ b/nightly.conf
> @@ -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]="
> +git@gitlab.freedesktop.org:drm/xe/kernel.git
> https://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
> +https://gitlab.freedesktop.org/drm/i915/kernel.git
> +ssh://git@gitlab.freedesktop.org/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
--
Jani Nikula, Intel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] nightly.conf: Update drm-intel URLs, add missing bare ssh drm-xe URL
2024-04-24 11:32 [PATCH] nightly.conf: Update drm-intel URLs, add missing bare ssh drm-xe URL Ryszard Knop
2024-04-24 11:41 ` ✗ Fi.CI.BUILD: failure for " Patchwork
2024-04-24 12:48 ` [PATCH] " Jani Nikula
@ 2024-04-24 13:23 ` Lucas De Marchi
2024-05-21 14:29 ` Lucas De Marchi
3 siblings, 0 replies; 5+ messages in thread
From: Lucas De Marchi @ 2024-04-24 13:23 UTC (permalink / raw)
To: Ryszard Knop; +Cc: dri-devel, intel-gfx
On Wed, Apr 24, 2024 at 01:32:19PM GMT, Ryszard Knop wrote:
>- 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.
>
>Signed-off-by: Ryszard Knop <ryszard.knop@intel.com>
>---
> nightly.conf | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
>diff --git a/nightly.conf b/nightly.conf
>index 7ef4249f0c67..2971277b0e25 100644
>--- a/nightly.conf
>+++ b/nightly.conf
>@@ -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]="
>+git@gitlab.freedesktop.org:drm/xe/kernel.git
> https://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
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.
Acked-by: Lucas De Marchi <lucas.demarchi@intel.com>
Lucas De Marchi
>+https://gitlab.freedesktop.org/drm/i915/kernel.git
>+ssh://git@gitlab.freedesktop.org/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
>--
>2.44.0
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] nightly.conf: Update drm-intel URLs, add missing bare ssh drm-xe URL
2024-04-24 11:32 [PATCH] nightly.conf: Update drm-intel URLs, add missing bare ssh drm-xe URL Ryszard Knop
` (2 preceding siblings ...)
2024-04-24 13:23 ` Lucas De Marchi
@ 2024-05-21 14:29 ` Lucas De Marchi
3 siblings, 0 replies; 5+ messages in thread
From: Lucas De Marchi @ 2024-05-21 14:29 UTC (permalink / raw)
To: Ryszard Knop; +Cc: dri-devel, intel-gfx
On Wed, Apr 24, 2024 at 01:32:19PM GMT, Ryszard Knop wrote:
>- 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.
>
>Signed-off-by: Ryszard Knop <ryszard.knop@intel.com>
Applied, thanks
Lucas De Marchi
^ permalink raw reply [flat|nested] 5+ messages in thread