All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>,
	Thomas Huth <thuth@redhat.com>,
	QEMU Developers <qemu-devel@nongnu.org>
Subject: Re: [PULL 00/19] gitlab-ci patches for 2021-05-26
Date: Thu, 27 May 2021 16:51:44 +0200	[thread overview]
Message-ID: <7209208b-8191-fb8e-5f0a-1cbca7bf5dc9@amsat.org> (raw)
In-Reply-To: <CAFEAcA-goVUqVxMd9QmvFsUUky0d1MmJ4N7A_oK4en-16VbUeA@mail.gmail.com>

On 5/27/21 3:56 PM, Peter Maydell wrote:
> On Wed, 26 May 2021 at 22:27, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
>>
>> The following changes since commit 2ab2dad01f6dc3667c0d53d2b1ba46b511031207:
>>
>>   Merge remote-tracking branch 'remotes/kraxel/tags/input-20210526-pull-request' into staging (2021-05-26 15:27:20 +0100)
>>
>> are available in the Git repository at:
>>
>>   https://github.com/philmd/qemu.git tags/gitlab-ci-20210526
>>
>> for you to fetch changes up to 740890e8935fff09023bb34c52e74ab1d539b775:
>>
>>   gitlab: Split gprof-gcov job (2021-05-26 23:01:47 +0200)
>>
>> ----------------------------------------------------------------
>> GitLab CI patches queue
>>
>> - Explode .gitlab-ci.yml in reusable templates
>> - Add job to cross build/test TCI on i386 host
>> - Remove CentOS 7 linux-user build job
>> - Split gprof-gcov job
>> - Temporarily set Avocado-based jobs in manual mode
>> - Increase time to hold Avocado reports to 1 week
>>
> 
> Conflict in .gitlab-ci.yml -- can you fix up and resend, please?

Paolo won the race by few minutes and commited 7cf333a3726
("gitlab-ci: use --meson=git for CFI jobs").

Sent v2 fixed.

Regards,

Phil.


      reply	other threads:[~2021-05-27 14:53 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-26 21:18 [PULL 00/19] gitlab-ci patches for 2021-05-26 Philippe Mathieu-Daudé
2021-05-26 21:18 ` [PULL 01/19] gitlab: Replace YAML anchors by extends (acceptance_test_job) Philippe Mathieu-Daudé
2021-05-26 21:18 ` [PULL 02/19] gitlab: Rename ACCEL_CONFIGURE_OPTS to EXTRA_CONFIGURE_OPTS Philippe Mathieu-Daudé
2021-05-26 21:18 ` [PULL 03/19] gitlab: Enable cross-i386 builds of TCI Philippe Mathieu-Daudé
2021-05-26 21:18 ` [PULL 04/19] gitlab: Extract container job template to container-template.yml Philippe Mathieu-Daudé
2021-05-26 21:18 ` [PULL 05/19] gitlab: Extract crossbuild job templates to crossbuild-template.yml Philippe Mathieu-Daudé
2021-05-26 21:18 ` [PULL 06/19] gitlab: Extract DCO/style check jobs to static_checks.yml Philippe Mathieu-Daudé
2021-05-26 21:18 ` [PULL 07/19] gitlab: Extract build stages to stages.yml Philippe Mathieu-Daudé
2021-05-26 21:18 ` [PULL 08/19] gitlab: Extract default build/test jobs templates Philippe Mathieu-Daudé
2021-05-26 21:18 ` [PULL 09/19] gitlab: Extract core container jobs to container-core.yml Philippe Mathieu-Daudé
2021-05-26 21:18 ` [PULL 10/19] gitlab: Drop linux user build job for CentOS 7 Philippe Mathieu-Daudé
2021-05-26 21:18 ` [PULL 11/19] gitlab: Extract all default build/test jobs to buildtest.yml Philippe Mathieu-Daudé
2021-05-26 21:18 ` [PULL 12/19] gitlab: Move current job set to qemu-project.yml Philippe Mathieu-Daudé
2021-05-26 21:18 ` [PULL 13/19] gitlab: Document how forks can use different set of jobs Philippe Mathieu-Daudé
2021-05-26 21:18 ` [PULL 14/19] gitlab: Extract cross-container jobs to container-cross.yml Philippe Mathieu-Daudé
2021-05-26 21:18 ` [PULL 15/19] gitlab: Keep Avocado reports during 1 week Philippe Mathieu-Daudé
2021-05-26 21:18 ` [PULL 16/19] gitlab: Run Avocado tests manually (except mainstream CI) Philippe Mathieu-Daudé
2021-05-26 21:18 ` [PULL 17/19] gitlab: Use $CI_DEFAULT_BRANCH instead of hardcoded 'master' Philippe Mathieu-Daudé
2021-05-26 21:18 ` [PULL 18/19] gitlab: Convert check-dco/check-patch jobs to the 'rules' syntax Philippe Mathieu-Daudé
2021-05-26 21:18 ` [PULL 19/19] gitlab: Split gprof-gcov job Philippe Mathieu-Daudé
2021-05-27  7:16   ` Philippe Mathieu-Daudé
2021-05-27 13:56 ` [PULL 00/19] gitlab-ci patches for 2021-05-26 Peter Maydell
2021-05-27 14:51   ` Philippe Mathieu-Daudé [this message]

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=7209208b-8191-fb8e-5f0a-1cbca7bf5dc9@amsat.org \
    --to=f4bug@amsat.org \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=thuth@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.