From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gnu.wildebeest.org (gnu.wildebeest.org [45.83.234.184]) by sourceware.org (Postfix) with ESMTPS id 415B73858C74 for ; Mon, 7 Mar 2022 14:42:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 415B73858C74 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=klomp.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=klomp.org Received: from tarox.wildebeest.org (83-87-18-245.cable.dynamic.v4.ziggo.nl [83.87.18.245]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by gnu.wildebeest.org (Postfix) with ESMTPSA id AC8B8301FEB8; Mon, 7 Mar 2022 15:42:16 +0100 (CET) Received: by tarox.wildebeest.org (Postfix, from userid 1000) id 2F33C401ED8D; Mon, 7 Mar 2022 15:42:16 +0100 (CET) Message-ID: Subject: Re: Buildbot failure in Wildebeest Builder on whole buildset From: Mark Wielaard To: Arthur Cohen , buildbot@builder.wildebeest.org, gcc-rust@gcc.gnu.org Date: Mon, 07 Mar 2022 15:42:16 +0100 In-Reply-To: References: <20220307094957.0FEB68021E3@builder.wildebeest.org> <9c0cd043-74a3-5db7-0265-5a6405f14f0e@embecosm.com> <78c86cf8e9fd5a8c6c4dd9a000432d7e65f1014f.camel@klomp.org> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Mailer: Evolution 3.28.5 (3.28.5-10.el7) Mime-Version: 1.0 X-Spam-Status: No, score=-3.8 required=5.0 tests=BAYES_00, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-rust@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: gcc-rust mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Mar 2022 14:42:21 -0000 Hi Arthur, On Mon, 2022-03-07 at 15:32 +0100, Arthur Cohen wrote: > I suspect this might be due to bors, our merging bot on github, and me= =20 > asking it to merge multiple pull requests this morning (around 4 or 5).= =20 > Not really sure. >=20 > But the bug is fixed and properly placed in the history :) Aha, I see, you are right. For some reason bors adds commits on top of old commits with a merge instead of doing a simple rebase on top of the latest commit. Making the git history look like a Christmas tree:=20 https://code.wildebeest.org/git/mirror/gccrs/log/ Your new commits were indeed on top of a 5 day old commit, so the buildbot dutifully tested it in context. And that context didn't include the fix yet. Would it make sense to tell bors to do a rebase instead of a merge before pushing to trunk? Cheers, Mark