* [PATCH v2] gitlab-ci: Move EDK2 YAML config to .gitlab-ci.d directory
@ 2020-02-11 9:50 Philippe Mathieu-Daudé
2020-02-11 13:26 ` Wainer dos Santos Moschetta
0 siblings, 1 reply; 2+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-02-11 9:50 UTC (permalink / raw)
To: qemu-devel
Cc: Philippe Mathieu-Daudé, Thomas Huth, Laszlo Ersek,
Wainer dos Santos Moschetta
We plan to let maintainers managing their own GitLab CI jobs.
The .gitlab-ci.d directory will contain all the new GitLab files,
to keep the root directory cleaner.
The EDK2 job was introduced before .gitlab-ci.d was suggested as
a common directory. Move the YAML file, update its references.
Suggested-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Acked-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
Supersedes: <20200211065022.11134-1-philmd@redhat.com>
v2: Reworded subject/description (Thomas)
---
.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] 2+ messages in thread
* Re: [PATCH v2] gitlab-ci: Move EDK2 YAML config to .gitlab-ci.d directory
2020-02-11 9:50 [PATCH v2] gitlab-ci: Move EDK2 YAML config to .gitlab-ci.d directory Philippe Mathieu-Daudé
@ 2020-02-11 13:26 ` Wainer dos Santos Moschetta
0 siblings, 0 replies; 2+ messages in thread
From: Wainer dos Santos Moschetta @ 2020-02-11 13:26 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel; +Cc: Thomas Huth, Laszlo Ersek
On 2/11/20 7:50 AM, Philippe Mathieu-Daudé wrote:
> We plan to let maintainers managing their own GitLab CI jobs.
> The .gitlab-ci.d directory will contain all the new GitLab files,
> to keep the root directory cleaner.
>
> The EDK2 job was introduced before .gitlab-ci.d was suggested as
> a common directory. Move the YAML file, update its references.
>
> Suggested-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
> Reviewed-by: Laszlo Ersek <lersek@redhat.com>
> Acked-by: Thomas Huth <thuth@redhat.com>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> Supersedes: <20200211065022.11134-1-philmd@redhat.com>
> v2: Reworded subject/description (Thomas)
> ---
> .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%)
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
> 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
> ------------------
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-02-11 13:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-02-11 9:50 [PATCH v2] gitlab-ci: Move EDK2 YAML config to .gitlab-ci.d directory Philippe Mathieu-Daudé
2020-02-11 13:26 ` Wainer dos Santos Moschetta
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).