qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Alex Bennée" <alex.bennee@linaro.org>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>,
	"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
	"Cleber Rosa" <crosa@redhat.com>
Subject: [PATCH 4/7] gitlab-ci: Move edk2 and opensbi YAML files to .gitlab-ci.d folder
Date: Mon, 25 May 2020 15:18:20 +0200	[thread overview]
Message-ID: <20200525131823.715-5-thuth@redhat.com> (raw)
In-Reply-To: <20200525131823.715-1-thuth@redhat.com>

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
-- 
2.18.1



  parent reply	other threads:[~2020-05-25 13:21 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-25 13:18 [PATCH 0/7] Gitlab CI improvements and fixes Thomas Huth
2020-05-25 13:18 ` [PATCH 1/7] MAINTAINERS: Add Philippe, Alex and Wainer to the Gitlab-CI section Thomas Huth
2020-05-25 13:18 ` [PATCH 2/7] gitlab-ci: Remove flex/bison packages Thomas Huth
2020-05-27 16:47   ` Alex Bennée
2020-05-25 13:18 ` [PATCH 3/7] GitLab CI: avoid calling before_scripts on unintended jobs Thomas Huth
2020-05-27 17:33   ` Alex Bennée
2020-05-25 13:18 ` Thomas Huth [this message]
2020-05-25 13:32   ` [PATCH 4/7] gitlab-ci: Move edk2 and opensbi YAML files to .gitlab-ci.d folder Philippe Mathieu-Daudé
2020-05-27 17:34   ` Alex Bennée
2020-05-25 13:18 ` [PATCH 5/7] gitlab-ci: Do not use the standard container images from gitlab Thomas Huth
2020-05-28  8:37   ` Alex Bennée
2020-05-25 13:18 ` [PATCH 6/7] gitlab-ci: Determine the number of jobs dynamically Thomas Huth
2020-05-28  8:41   ` Alex Bennée
2020-05-28  9:11     ` Thomas Huth
2020-05-25 13:18 ` [PATCH 7/7] linux-user: limit check to HOST_LONG_BITS < TARGET_ABI_BITS Thomas Huth
2020-05-27 14:44   ` Laurent Vivier
2020-05-27 14:51     ` Thomas Huth
2020-05-27 16:36       ` Alex Bennée
2020-05-28  6:45         ` Thomas Huth
2020-05-28  8:31           ` Alex Bennée

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200525131823.715-5-thuth@redhat.com \
    --to=thuth@redhat.com \
    --cc=alex.bennee@linaro.org \
    --cc=crosa@redhat.com \
    --cc=philmd@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=wainersm@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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).