| Message ID | 20200525131823.715-5-thuth@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Gitlab CI improvements and fixes | expand |
On 5/25/20 3:18 PM, Thomas Huth wrote: > We have a dedicated folder for the gitlab-ci - so there is no need > to clutter the top directory with these .yml files. > > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- > .gitlab-ci-edk2.yml => .gitlab-ci.d/edk2.yml | 0 > .gitlab-ci-opensbi.yml => .gitlab-ci.d/opensbi.yml | 0 > .gitlab-ci.yml | 4 ++-- > MAINTAINERS | 2 +- > 4 files changed, 3 insertions(+), 3 deletions(-) > rename .gitlab-ci-edk2.yml => .gitlab-ci.d/edk2.yml (100%) > rename .gitlab-ci-opensbi.yml => .gitlab-ci.d/opensbi.yml (100%) > > diff --git a/.gitlab-ci-edk2.yml b/.gitlab-ci.d/edk2.yml > similarity index 100% > rename from .gitlab-ci-edk2.yml > rename to .gitlab-ci.d/edk2.yml > diff --git a/.gitlab-ci-opensbi.yml b/.gitlab-ci.d/opensbi.yml > similarity index 100% > rename from .gitlab-ci-opensbi.yml > rename to .gitlab-ci.d/opensbi.yml > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml > index bc6aee6aba..5208d93ff8 100644 > --- a/.gitlab-ci.yml > +++ b/.gitlab-ci.yml > @@ -1,6 +1,6 @@ > include: > - - local: '/.gitlab-ci-edk2.yml' > - - local: '/.gitlab-ci-opensbi.yml' > + - local: '/.gitlab-ci.d/edk2.yml' > + - local: '/.gitlab-ci.d/opensbi.yml' > > .update_apt_template: &before_script_apt > before_script: > diff --git a/MAINTAINERS b/MAINTAINERS > index bde5fd480f..d43c98115c 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -2534,7 +2534,7 @@ F: roms/edk2 > F: roms/edk2-* > F: tests/data/uefi-boot-images/ > F: tests/uefi-test-tools/ > -F: .gitlab-ci-edk2.yml > +F: .gitlab-ci.d/edk2.yml > F: .gitlab-ci.d/edk2/ > > Usermode Emulation > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Thomas Huth <thuth@redhat.com> writes: > We have a dedicated folder for the gitlab-ci - so there is no need > to clutter the top directory with these .yml files. > > Signed-off-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> > --- > .gitlab-ci-edk2.yml => .gitlab-ci.d/edk2.yml | 0 > .gitlab-ci-opensbi.yml => .gitlab-ci.d/opensbi.yml | 0 > .gitlab-ci.yml | 4 ++-- > MAINTAINERS | 2 +- > 4 files changed, 3 insertions(+), 3 deletions(-) > rename .gitlab-ci-edk2.yml => .gitlab-ci.d/edk2.yml (100%) > rename .gitlab-ci-opensbi.yml => .gitlab-ci.d/opensbi.yml (100%) > > diff --git a/.gitlab-ci-edk2.yml b/.gitlab-ci.d/edk2.yml > similarity index 100% > rename from .gitlab-ci-edk2.yml > rename to .gitlab-ci.d/edk2.yml > diff --git a/.gitlab-ci-opensbi.yml b/.gitlab-ci.d/opensbi.yml > similarity index 100% > rename from .gitlab-ci-opensbi.yml > rename to .gitlab-ci.d/opensbi.yml > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml > index bc6aee6aba..5208d93ff8 100644 > --- a/.gitlab-ci.yml > +++ b/.gitlab-ci.yml > @@ -1,6 +1,6 @@ > include: > - - local: '/.gitlab-ci-edk2.yml' > - - local: '/.gitlab-ci-opensbi.yml' > + - local: '/.gitlab-ci.d/edk2.yml' > + - local: '/.gitlab-ci.d/opensbi.yml' > > .update_apt_template: &before_script_apt > before_script: > diff --git a/MAINTAINERS b/MAINTAINERS > index bde5fd480f..d43c98115c 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -2534,7 +2534,7 @@ F: roms/edk2 > F: roms/edk2-* > F: tests/data/uefi-boot-images/ > F: tests/uefi-test-tools/ > -F: .gitlab-ci-edk2.yml > +F: .gitlab-ci.d/edk2.yml > F: .gitlab-ci.d/edk2/ > > Usermode Emulation
diff --git a/.gitlab-ci-edk2.yml b/.gitlab-ci.d/edk2.yml similarity index 100% rename from .gitlab-ci-edk2.yml rename to .gitlab-ci.d/edk2.yml diff --git a/.gitlab-ci-opensbi.yml b/.gitlab-ci.d/opensbi.yml similarity index 100% rename from .gitlab-ci-opensbi.yml rename to .gitlab-ci.d/opensbi.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bc6aee6aba..5208d93ff8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,6 @@ include: - - local: '/.gitlab-ci-edk2.yml' - - local: '/.gitlab-ci-opensbi.yml' + - local: '/.gitlab-ci.d/edk2.yml' + - local: '/.gitlab-ci.d/opensbi.yml' .update_apt_template: &before_script_apt before_script: diff --git a/MAINTAINERS b/MAINTAINERS index bde5fd480f..d43c98115c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2534,7 +2534,7 @@ F: roms/edk2 F: roms/edk2-* F: tests/data/uefi-boot-images/ F: tests/uefi-test-tools/ -F: .gitlab-ci-edk2.yml +F: .gitlab-ci.d/edk2.yml F: .gitlab-ci.d/edk2/ Usermode Emulation
We have a dedicated folder for the gitlab-ci - so there is no need to clutter the top directory with these .yml files. Signed-off-by: Thomas Huth <thuth@redhat.com> --- .gitlab-ci-edk2.yml => .gitlab-ci.d/edk2.yml | 0 .gitlab-ci-opensbi.yml => .gitlab-ci.d/opensbi.yml | 0 .gitlab-ci.yml | 4 ++-- MAINTAINERS | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename .gitlab-ci-edk2.yml => .gitlab-ci.d/edk2.yml (100%) rename .gitlab-ci-opensbi.yml => .gitlab-ci.d/opensbi.yml (100%)