Skip to main content
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [theia-dev] Master breakage
  • From: Rob Moran <Rob.Moran@xxxxxxx>
  • Date: Thu, 16 Mar 2023 15:39:59 +0000
  • Accept-language: en-GB, en-US
  • Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none
  • Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=5w8FqnDt9bBlScUdUnBXcLpXcRuTnBMkJjdk0JjVJyM=; b=WYbqtNxuUeE9npajqxHWFNtqPDKK2SEvesTiVyl9GhvMMszobHf61haEMbzYfZVaGMEweXJHUMajw+ISpreupx6yEVtq9THZkAH0aGjYTtxIq9Edr/omKAaij11hDvRRv3hfHJrrNePRbib1uQIIuDoznKZGxaXeIaa0BWuiqywJMttHpLuUsp4G03zScQfi4fCFEfSlZOT6rCmi/H8crx+eCUq/dp13OH4eoCXUfNzCNYiq3clSEkxiSRLnD3DhNyMZbedIZVUFGC+dNemM2ClMLl6y+PFmw4yvvSrBGB27aOFjDYiNzeyh2xWo1BsaD/vX/VILhVQ/TV/N58LTWg==
  • Arc-seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=S1e3qiJqVBO7Z4jvIp7EGw4WC2DnDjM309DC7Dv5HHrDccpjibRLDeIFyfuZvc1fKUg2hDcFYLePETdTzGzQP3HArB3AH+fRjQliqYbMLtENOU7u+iVAr569mMRswjPGFjhDM4TyuzHo4G5Nd5eUIe/jHkxkLb/ezz6+KTTk7e1siw6wNrPDKEuTBg/s9lecTFAXH/B2WY+1IddNlJ3sZiXS6SBqqINL3c0XGSomAG0UXppCGO4aXeDhc/bAv5IHX+S89Xa6aVUfeFuQpjCuEZrxuW6+yXtn2AyvWW9+VVgcpObsw2mKisNwayoydmVhld5sKHsTPSfwvRYQhMp2rw==
  • Delivered-to: theia-dev@xxxxxxxxxxx
  • List-archive: <https://www.eclipse.org/mailman/private/theia-dev/>
  • List-help: <mailto:theia-dev-request@eclipse.org?subject=help>
  • List-subscribe: <https://www.eclipse.org/mailman/listinfo/theia-dev>, <mailto:theia-dev-request@eclipse.org?subject=subscribe>
  • List-unsubscribe: <https://www.eclipse.org/mailman/options/theia-dev>, <mailto:theia-dev-request@eclipse.org?subject=unsubscribe>
  • Msip_labels:
  • Nodisclaimer: true
  • Original-authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com;
  • Thread-index: AQHZWBIsD0DQxnkHck+pRs+MKwxkoK79dWBogAAGMICAAA9h8w==
  • Thread-topic: [theia-dev] Master breakage
Yes and yes
From: theia-dev <theia-dev-bounces@xxxxxxxxxxx> on behalf of Marc Dumais via theia-dev <theia-dev@xxxxxxxxxxx>
Sent: 16 March 2023 14:44
To: theia developer discussions <theia-dev@xxxxxxxxxxx>
Cc: Marc Dumais <marc.dumais@xxxxxxxxxxxx>
Subject: Re: [theia-dev] Master breakage
 
Hi Rob,

Interesting, thanks for pointing out this GitHub option. Is the following what happens when a PR is detected as not having an up-to-date branch (see step 3)? :
https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/keeping-your-pull-request-in-sync-with-the-base-branch#updating-your-pull-request-branch

Do you know if CI will trigger again after one clicks "Update Branch"?

Thanks,
Marc


From: theia-dev <theia-dev-bounces@xxxxxxxxxxx> on behalf of Rob Moran <Rob.Moran@xxxxxxx>
Sent: Thursday, March 16, 2023 10:27 AM
To: theia developer discussions <theia-dev@xxxxxxxxxxx>
Subject: Re: [theia-dev] Master breakage
 
/hands-up

Yes, this was my bad. Apologies and in hindsight I was a little hasty in merging.

I was aware it was an older PR, but usually rely on GitHub to highlight the branch wasn't up to date. Investigation shows this is a per-repo setting we have switched on for Arm's repositories. Perhaps we can enable this for the Theia master branch?

Under the branch protection rules:

Require branches to be up to date before merging



Kind regards,

Rob
From: theia-dev <theia-dev-bounces@xxxxxxxxxxx> on behalf of Colin Grant via theia-dev <theia-dev@xxxxxxxxxxx>
Sent: 16 March 2023 14:18
To: theia developer discussions <theia-dev@xxxxxxxxxxx>
Cc: Colin Grant <colin.grant@xxxxxxxxxxxx>
Subject: Re: [theia-dev] Master breakage
 

Hello all,

 

That was a fairly unusual case of a very old PR that had passed all of the checks at the time and managed not to have any conflicts with the current state of master, but didn’t actually fit the current state of the code. We could go back to a merge strategy that requires manual rebases so that no code that isn’t actually up to date with (and hasn’t run CI with) the current state of master gets in; we could, GitHub actions permitting, invalidate CI runs of a certain age. Both of those would certainly take care of this kind of situation though _always_ requiring a manual rebase on the very tip of master would like be a pain. If it’s possible, I’d lean towards some sort of staleness in CI, but fortunately, with our drive to clear out the PR queue, we also don’t have that many old PR’s sitting around in this condition.

 

Best,

Colin

 

From: theia-dev <theia-dev-bounces@xxxxxxxxxxx> On Behalf Of Thomas Mäder
Sent: Thursday, March 16, 2023 8:10 AM
To: theia-dev@xxxxxxxxxxx
Subject: [theia-dev] Master breakage

 

Hi folks,

 

we recently merged https://github.com/eclipse-theia/theia/pull/10338, which seems to have broken master. Mistakes happen, but I'm wondering if we can improve our process? Did the linter check fail and we merged anyway, or is there some technical improvement we can make?

 

I'd also would encourage anyone who is involved in a "master is broken"-situation to write a quick mail to this very list to alert the community. It keeps everyone with failing PR's from having to investigate what's wrong themselves.

 

thanks,

 

/Thomas

IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.
IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.

Back to the top