gitlab-ci: Fix the change rules after moving the YML files

[PATCH] gitlab-ci: Fix the change rules after moving the YML files

Posted by Thomas Huth 3 years, 9 months ago

The edk2.yml and opensbi.yml files have recently been moved/renamed,
but the change has not been reflected in the rules in the YML files
yet.

Fixes: 922febe2af ("Move edk2 and opensbi YAML files to .gitlab-ci.d folder")
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 .gitlab-ci.d/edk2.yml    | 2 +-
 .gitlab-ci.d/opensbi.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.d/edk2.yml b/.gitlab-ci.d/edk2.yml
index 088ba4b43a..a9990b7147 100644
--- a/.gitlab-ci.d/edk2.yml
+++ b/.gitlab-ci.d/edk2.yml
@@ -2,7 +2,7 @@ docker-edk2:
  stage: build
  rules: # Only run this job when the Dockerfile is modified
  - changes:
-   - .gitlab-ci-edk2.yml
+   - .gitlab-ci.d/edk2.yml
    - .gitlab-ci.d/edk2/Dockerfile
    when: always
  image: docker:19.03.1
diff --git a/.gitlab-ci.d/opensbi.yml b/.gitlab-ci.d/opensbi.yml
index dd051c0124..6a1750784a 100644
--- a/.gitlab-ci.d/opensbi.yml
+++ b/.gitlab-ci.d/opensbi.yml
@@ -2,7 +2,7 @@ docker-opensbi:
  stage: build
  rules: # Only run this job when the Dockerfile is modified
  - changes:
-   - .gitlab-ci-opensbi.yml
+   - .gitlab-ci.d/opensbi.yml
    - .gitlab-ci.d/opensbi/Dockerfile
    when: always
  image: docker:19.03.1
-- 
2.18.1

Re: [PATCH] gitlab-ci: Fix the change rules after moving the YML files

Posted by Alex Bennée 3 years, 9 months ago

Thomas Huth <thuth@redhat.com> writes:

> The edk2.yml and opensbi.yml files have recently been moved/renamed,
> but the change has not been reflected in the rules in the YML files
> yet.
>
> Fixes: 922febe2af ("Move edk2 and opensbi YAML files to .gitlab-ci.d folder")
> Signed-off-by: Thomas Huth <thuth@redhat.com>

Queued to testing/next, thanks.

-- 
Alex Bennée

Re: [PATCH] gitlab-ci: Fix the change rules after moving the YML files

Posted by Philippe Mathieu-Daudé 3 years, 9 months ago

On 6/25/20 5:16 PM, Thomas Huth wrote:
> The edk2.yml and opensbi.yml files have recently been moved/renamed,
> but the change has not been reflected in the rules in the YML files
> yet.
> 
> Fixes: 922febe2af ("Move edk2 and opensbi YAML files to .gitlab-ci.d folder")
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  .gitlab-ci.d/edk2.yml    | 2 +-
>  .gitlab-ci.d/opensbi.yml | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/.gitlab-ci.d/edk2.yml b/.gitlab-ci.d/edk2.yml
> index 088ba4b43a..a9990b7147 100644
> --- a/.gitlab-ci.d/edk2.yml
> +++ b/.gitlab-ci.d/edk2.yml
> @@ -2,7 +2,7 @@ docker-edk2:
>   stage: build
>   rules: # Only run this job when the Dockerfile is modified
>   - changes:
> -   - .gitlab-ci-edk2.yml
> +   - .gitlab-ci.d/edk2.yml

Thanks!

>     - .gitlab-ci.d/edk2/Dockerfile
>     when: always
>   image: docker:19.03.1
> diff --git a/.gitlab-ci.d/opensbi.yml b/.gitlab-ci.d/opensbi.yml
> index dd051c0124..6a1750784a 100644
> --- a/.gitlab-ci.d/opensbi.yml
> +++ b/.gitlab-ci.d/opensbi.yml
> @@ -2,7 +2,7 @@ docker-opensbi:
>   stage: build
>   rules: # Only run this job when the Dockerfile is modified
>   - changes:
> -   - .gitlab-ci-opensbi.yml
> +   - .gitlab-ci.d/opensbi.yml

FWIW:

./scripts/get_maintainer.pl -f .gitlab-ci.d/opensbi.yml
get_maintainer.pl: No maintainers found, printing recent contributors.
get_maintainer.pl: Do not blindly cc: them on patches!  Use common sense.

Missed in c6fc0fc1a71a (apparently patchew bot was down when Bin
sent the patch).

Cc'ing Alistair who Acked the patch (also missed in the same commit,
see https://www.mail-archive.com/qemu-devel@nongnu.org/msg682407.html)

>     - .gitlab-ci.d/opensbi/Dockerfile
>     when: always
>   image: docker:19.03.1
> 

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Re: [PATCH] gitlab-ci: Fix the change rules after moving the YML files

Posted by Bin Meng 3 years, 9 months ago

Hi Philippe,

On Thu, Jun 25, 2020 at 11:28 PM Philippe Mathieu-Daudé
<philmd@redhat.com> wrote:
>
> On 6/25/20 5:16 PM, Thomas Huth wrote:
> > The edk2.yml and opensbi.yml files have recently been moved/renamed,
> > but the change has not been reflected in the rules in the YML files
> > yet.
> >
> > Fixes: 922febe2af ("Move edk2 and opensbi YAML files to .gitlab-ci.d folder")
> > Signed-off-by: Thomas Huth <thuth@redhat.com>
> > ---
> >  .gitlab-ci.d/edk2.yml    | 2 +-
> >  .gitlab-ci.d/opensbi.yml | 2 +-
> >  2 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/.gitlab-ci.d/edk2.yml b/.gitlab-ci.d/edk2.yml
> > index 088ba4b43a..a9990b7147 100644
> > --- a/.gitlab-ci.d/edk2.yml
> > +++ b/.gitlab-ci.d/edk2.yml
> > @@ -2,7 +2,7 @@ docker-edk2:
> >   stage: build
> >   rules: # Only run this job when the Dockerfile is modified
> >   - changes:
> > -   - .gitlab-ci-edk2.yml
> > +   - .gitlab-ci.d/edk2.yml
>
> Thanks!
>
> >     - .gitlab-ci.d/edk2/Dockerfile
> >     when: always
> >   image: docker:19.03.1
> > diff --git a/.gitlab-ci.d/opensbi.yml b/.gitlab-ci.d/opensbi.yml
> > index dd051c0124..6a1750784a 100644
> > --- a/.gitlab-ci.d/opensbi.yml
> > +++ b/.gitlab-ci.d/opensbi.yml
> > @@ -2,7 +2,7 @@ docker-opensbi:
> >   stage: build
> >   rules: # Only run this job when the Dockerfile is modified
> >   - changes:
> > -   - .gitlab-ci-opensbi.yml
> > +   - .gitlab-ci.d/opensbi.yml
>
> FWIW:
>
> ./scripts/get_maintainer.pl -f .gitlab-ci.d/opensbi.yml
> get_maintainer.pl: No maintainers found, printing recent contributors.
> get_maintainer.pl: Do not blindly cc: them on patches!  Use common sense.
>
> Missed in c6fc0fc1a71a (apparently patchew bot was down when Bin
> sent the patch).

I will add an entry to MAINTAINERS file for this. Thanks!

>
> Cc'ing Alistair who Acked the patch (also missed in the same commit,
> see https://www.mail-archive.com/qemu-devel@nongnu.org/msg682407.html)
>
> >     - .gitlab-ci.d/opensbi/Dockerfile
> >     when: always
> >   image: docker:19.03.1
> >
>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Regards,
Bin