git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
	Lars Schneider <larsxschneider@gmail.com>,
	Git Mailing List <git@vger.kernel.org>, Jeff King <peff@peff.net>,
	Brandon Williams <bmwill@google.com>
Subject: Re: What's cooking in git.git (Apr 2017, #04; Wed, 19)
Date: Mon, 24 Apr 2017 17:56:49 -0700	[thread overview]
Message-ID: <xmqqbmrlz4mm.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <CACBZZX7AmzFw-jVC_hd1t+qjK5jD485XD8g6U72p4RLoRD_kJA@mail.gmail.com> ("Ævar Arnfjörð Bjarmason"'s message of "Mon, 24 Apr 2017 17:18:57 +0200")

Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:

> Is getting the results of these builds time-critical? If not perhaps
> an acceptable solution would be to use a source repo that's
> time-delayed, e.g. 24hrs behind on average from Junio's git.git, and
> where commits are pushed in at some configurable trickle.

Because the tip of 'pu' is updated every day, but the tips of
individual topics are not, the tip of the more stable side of
integration branches are less often updated, I would think that an
automated procedure (whether it is Travis or Dscho's Windows thing)
that is most efficient for us would:

 - treat updates to 'maint', 'master' and 'next' as they do right
   now;

 - use update to 'pu' as a mere "trigger" and not test 'pu' as an
   aggregate as it is not very interesting (merges near the tip may
   be merging known-broken topics, like yesterday's pushout).

And arrange 'pu' update to trigger a procedure like this:

 - Grab the list of merge commits beyond what matches 'next':

   $ git rev-list --first-parent '^pu^{/^### match next}' pu

 - For each of these merges:

   - If its second parent (i.e. the tip of a topic) was already
     tested with the current 'master', do not bother testing it
     again;

   - Otherwise, call its second parent "it" in the below:

     - Create a merge of it (and nothing else) on top of 'master',
       and test it.  Each topic is intended to be able to graduate
       without other topics in 'pu', so this will catch potential
       breakage early and help blocking a broken topic from getting
       merged to 'master'.

     - When the above fails, test it in isolation to see if it
       itself is broken.  If this succeeds, we may have discovered
       unintended interactions between the topic and other topics
       already in 'master'.  Or the topic itself may already been
       broken.

     - In either case, record the test result so that the same tip
       of the topic would not have to be tested again, merely
       because the tip of 'pu' got updated next day due to updates
       in other topics.

We can s/master/next/ in the above description (I am undecided on
pros-and-cons between using 'master' and 'next').

  reply	other threads:[~2017-04-25  0:57 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-04-20  5:37 What's cooking in git.git (Apr 2017, #04; Wed, 19) Junio C Hamano
2017-04-20  9:59 ` Duy Nguyen
2017-04-20 15:35   ` Jeff King
2017-04-20 22:51     ` Junio C Hamano
2017-04-20 22:46   ` Junio C Hamano
     [not found] ` <D61D47BD-9750-4FB6-892E-013504E03738@gmail.com>
2017-04-20 13:24   ` Johannes Schindelin
2017-04-20 16:56     ` Brandon Williams
2017-04-20 23:18       ` Brandon Williams
2017-04-21  0:56         ` Junio C Hamano
2017-04-20 22:58   ` Junio C Hamano
2017-04-21  9:50     ` Johannes Schindelin
2017-04-21 12:29       ` Christian Couder
2017-04-22 11:48         ` Johannes Schindelin
2017-04-22 17:32           ` Christian Couder
2017-04-24 14:08             ` Johannes Schindelin
2017-04-22 13:37         ` Johannes Sixt
2017-04-24 14:24           ` Johannes Schindelin
2017-04-24 16:34             ` Philip Oakley
2017-04-25  2:17               ` Christian Couder
2017-04-25  2:00           ` Christian Couder
2017-04-25  5:51             ` Johannes Sixt
2017-04-25  6:52               ` Junio C Hamano
2017-04-25 18:26                 ` Johannes Sixt
2017-04-24  0:25       ` Junio C Hamano
2017-04-24 14:19         ` Johannes Schindelin
2017-04-24 15:18           ` Ævar Arnfjörð Bjarmason
2017-04-25  0:56             ` Junio C Hamano [this message]
2017-04-20 15:32 ` Lars Schneider
2017-04-20 22:52   ` Junio C Hamano

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

  List information: http://vger.kernel.org/majordomo-info.html

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

  git send-email \
    --in-reply-to=xmqqbmrlz4mm.fsf@gitster.mtv.corp.google.com \
    --to=gitster@pobox.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=avarab@gmail.com \
    --cc=bmwill@google.com \
    --cc=git@vger.kernel.org \
    --cc=larsxschneider@gmail.com \
    --cc=peff@peff.net \
    /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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).