* [PATCH] gitlab-ci.yml: Add .gitlab-ci.d directory for GitLab specific files
@ 2020-02-11 6:50 Philippe Mathieu-Daudé
2020-02-11 7:48 ` Laszlo Ersek
2020-02-11 8:29 ` Thomas Huth
0 siblings, 2 replies; 3+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-02-11 6:50 UTC (permalink / raw)
To: qemu-devel
Cc: Philippe Mathieu-Daudé, Thomas Huth, Laszlo Ersek,
Wainer dos Santos Moschetta
As we plan to let maintainers managing their own GitLab CI jobs,
add a single directory to contain all the new files (to keep the
root directory cleaner).
EDK2 job is the first user, move it there.
Suggested-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
.gitignore | 1 +
.gitlab-ci-edk2.yml => .gitlab-ci.d/edk2.yml | 2 +-
.gitlab-ci.yml | 2 +-
MAINTAINERS | 3 +--
4 files changed, 4 insertions(+), 4 deletions(-)
rename .gitlab-ci-edk2.yml => .gitlab-ci.d/edk2.yml (98%)
diff --git a/.gitignore b/.gitignore
index bc0a035f9c..18288eacd1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -95,6 +95,7 @@
*.tp
*.vr
*.d
+!/.gitlab-ci.d
!/scripts/qemu-guest-agent/fsfreeze-hook.d
*.o
.sdk
diff --git a/.gitlab-ci-edk2.yml b/.gitlab-ci.d/edk2.yml
similarity index 98%
rename from .gitlab-ci-edk2.yml
rename to .gitlab-ci.d/edk2.yml
index 088ba4b43a..a9990b7147 100644
--- a/.gitlab-ci-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.yml b/.gitlab-ci.yml
index c15e394f09..dae6045d78 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
include:
- - local: '/.gitlab-ci-edk2.yml'
+ - local: '/.gitlab-ci.d/edk2.yml'
before_script:
- apt-get update -qq
diff --git a/MAINTAINERS b/MAINTAINERS
index c7717df720..fb00a55f41 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2391,8 +2391,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/
+F: .gitlab-ci.d/edk2*
Usermode Emulation
------------------
--
2.21.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] gitlab-ci.yml: Add .gitlab-ci.d directory for GitLab specific files
2020-02-11 6:50 [PATCH] gitlab-ci.yml: Add .gitlab-ci.d directory for GitLab specific files Philippe Mathieu-Daudé
@ 2020-02-11 7:48 ` Laszlo Ersek
2020-02-11 8:29 ` Thomas Huth
1 sibling, 0 replies; 3+ messages in thread
From: Laszlo Ersek @ 2020-02-11 7:48 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: Thomas Huth, Wainer dos Santos Moschetta
On 02/11/20 07:50, Philippe Mathieu-Daudé wrote:
> As we plan to let maintainers managing their own GitLab CI jobs,
> add a single directory to contain all the new files (to keep the
> root directory cleaner).
>
> EDK2 job is the first user, move it there.
>
> Suggested-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> .gitignore | 1 +
> .gitlab-ci-edk2.yml => .gitlab-ci.d/edk2.yml | 2 +-
> .gitlab-ci.yml | 2 +-
> MAINTAINERS | 3 +--
> 4 files changed, 4 insertions(+), 4 deletions(-)
> rename .gitlab-ci-edk2.yml => .gitlab-ci.d/edk2.yml (98%)
>
> diff --git a/.gitignore b/.gitignore
> index bc0a035f9c..18288eacd1 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -95,6 +95,7 @@
> *.tp
> *.vr
> *.d
> +!/.gitlab-ci.d
> !/scripts/qemu-guest-agent/fsfreeze-hook.d
> *.o
> .sdk
> diff --git a/.gitlab-ci-edk2.yml b/.gitlab-ci.d/edk2.yml
> similarity index 98%
> rename from .gitlab-ci-edk2.yml
> rename to .gitlab-ci.d/edk2.yml
> index 088ba4b43a..a9990b7147 100644
> --- a/.gitlab-ci-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.yml b/.gitlab-ci.yml
> index c15e394f09..dae6045d78 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -1,5 +1,5 @@
> include:
> - - local: '/.gitlab-ci-edk2.yml'
> + - local: '/.gitlab-ci.d/edk2.yml'
>
> before_script:
> - apt-get update -qq
> diff --git a/MAINTAINERS b/MAINTAINERS
> index c7717df720..fb00a55f41 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -2391,8 +2391,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/
> +F: .gitlab-ci.d/edk2*
>
> Usermode Emulation
> ------------------
>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] gitlab-ci.yml: Add .gitlab-ci.d directory for GitLab specific files
2020-02-11 6:50 [PATCH] gitlab-ci.yml: Add .gitlab-ci.d directory for GitLab specific files Philippe Mathieu-Daudé
2020-02-11 7:48 ` Laszlo Ersek
@ 2020-02-11 8:29 ` Thomas Huth
1 sibling, 0 replies; 3+ messages in thread
From: Thomas Huth @ 2020-02-11 8:29 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: Laszlo Ersek, Wainer dos Santos Moschetta
On 11/02/2020 07.50, Philippe Mathieu-Daudé wrote:
> As we plan to let maintainers managing their own GitLab CI jobs,
> add a single directory to contain all the new files (to keep the
> root directory cleaner).
The title and description is a little bit confusing, since the directory
is already there and you just move the YML file into it... so I'd
suggest to rather talk about moving that file instead of adding the
directory.
With the patch description updated:
Acked-by: Thomas Huth <thuth@redhat.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-02-11 8:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-02-11 6:50 [PATCH] gitlab-ci.yml: Add .gitlab-ci.d directory for GitLab specific files Philippe Mathieu-Daudé
2020-02-11 7:48 ` Laszlo Ersek
2020-02-11 8:29 ` Thomas Huth
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).