On 07/01/2020 16.31, Philippe Mathieu-Daudé wrote: > Add two GitLab job to build the EDK2 firmware binaries. > > The first job build a Docker image with the packages requisite > to build EDK2, and store this image in the GitLab registry. > The second job pull the image from the registry and build the > EDK2 firmware binaries. > > The docker image is only rebuilt if the GitLab YAML or the > Dockerfile is updated. > The second job is only built when the roms/edk2/ submodule is > updated, when a git-ref starts with 'edk2' or when the last > commit contains 'EDK2'. The files generated are archived in > the artifacts.zip file.
Don't you build the EDK2 QEMU binaries in the tianocore CI yet? ... Feels a little bit weird to build EDK2 as part of the QEMU CI, too...? > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml > index ebcef0ebe9..f799246047 100644 > --- a/.gitlab-ci.yml > +++ b/.gitlab-ci.yml > @@ -1,3 +1,6 @@ > +include: > + - local: '/.gitlab-ci-edk2.yml' > + > before_script: > - apt-get update -qq > - apt-get install -y -qq flex bison libglib2.0-dev libpixman-1-dev > genisoimage > diff --git a/MAINTAINERS b/MAINTAINERS > index cd2dc137a3..93620ed406 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -2358,6 +2358,8 @@ 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/ > > Usermode Emulation > ------------------ > @@ -2701,7 +2703,7 @@ W: https://cirrus-ci.com/github/qemu/qemu > GitLab Continuous Integration > M: Thomas Huth <th...@redhat.com> > S: Maintained > -F: .gitlab-ci.yml > +F: .gitlab-ci*.yml I don't think that I want to be responsible for the .gitlab-ci-edk2.yml file, so could you please drop that hunk from the patch? Thanks. With that hunk removed, FWIW: Acked-by: Thomas Huth <th...@redhat.com>
