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 B5754385840A for ; Fri, 3 Nov 2023 13:56:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B5754385840A Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=klomp.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=klomp.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org B5754385840A Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=45.83.234.184 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699019798; cv=none; b=PIkFBt7grOnx4ubqQVPW5TSBYE4kkQIfXYJip4DuDUeqYAI5AnS8ioYMpjDB28e6xgetG7+0XR9zgtQTDGMcyiwYaw1D6zpk1PgRSL9f9IhbhoXlRxvHoiNQ26psweX5W0SWBnO05Buaxj+fEJFC0lqU/mRTwPUrr/Xb6b1GLpg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699019798; c=relaxed/simple; bh=GsQhntfKIwUDgYTntm+v287NwTmlSACK2ojZ9fYVl8M=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=INiLKBnCZ5yVCjlavToyBJ8IIjhIqdAroGERK9cx/xpTURD8T6/iZRB7so3Cm6XSc/FAo4rm1Ad9eqX1KC6Z0cKOOU/D6o3bLVPFvCZhZhZ9CLQzuyw3gob2LSyfDBwYYaerWDDQ/vPbARM98OngukF6nhjnB/qAhOXaPVgPf0M= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from r6.localdomain (82-217-174-174.cable.dynamic.v4.ziggo.nl [82.217.174.174]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by gnu.wildebeest.org (Postfix) with ESMTPSA id 9903E302FDC3; Fri, 3 Nov 2023 14:56:21 +0100 (CET) Received: by r6.localdomain (Postfix, from userid 1000) id 8A04934032A; Fri, 3 Nov 2023 14:56:20 +0100 (CET) From: Mark Wielaard To: buildbot@sourceware.org Cc: Mark Wielaard Subject: [PATCH] elfutils moved to main branch Date: Fri, 3 Nov 2023 14:56:15 +0100 Message-ID: <20231103135615.602931-1-mark@klomp.org> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3033.3 required=5.0 tests=BAYES_00,GIT_PATCH_0,JMQ_SPF_NEUTRAL,KAM_DMARC_STATUS,RCVD_IN_BARRACUDACENTRAL,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: --- builder/master.cfg | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/builder/master.cfg b/builder/master.cfg index 4a40edf..d6b4d47 100644 --- a/builder/master.cfg +++ b/builder/master.cfg @@ -314,6 +314,14 @@ def master_and_users_try_branches(ref): return True return False +def main_and_users_try_branches(ref): + if ref == "refs/heads/main": + return True + match = re.match ("refs/heads/users/[a-zA-Z0-9]+/try-", ref) + if match: + return True + return False + # For git maint branches (as gnu poke uses) def master_and_maint_branches(ref): if ref == "refs/heads/master": @@ -337,7 +345,7 @@ c['change_source'].append(sourceware_gitpoller) elfutils_repourl='https://sourceware.org/git/elfutils.git' elfutils_gitpoller = changes.GitPoller(repourl=elfutils_repourl, - branches=master_and_users_try_branches, + branches=main_and_users_try_branches, buildPushesWithNoCommits=True, pollInterval=3*60, pollRandomDelayMax=2*60, @@ -483,8 +491,8 @@ c['schedulers'].append(sourceware_reconfig_scheduler) elfutils_scheduler = schedulers.SingleBranchScheduler( name="elfutils", change_filter=util.ChangeFilter(project="elfutils", - branch="master"), - reason="elfutils project master branch update", + branch="main"), + reason="elfutils project main branch update", builderNames=["elfutils-centos-x86_64", # "elfutils-debian-arm64", "elfutils-fedora-arm64", @@ -528,11 +536,11 @@ c['schedulers'].append(elfutils_try_scheduler) elfutils_snapshot_scheduler = schedulers.Periodic( name="elfutils-snapshots", change_filter=util.ChangeFilter(project="elfutils", - branch="master"), - branch="master", + branch="main"), + branch="main", periodicBuildTimer=15*60, # 15 minutes in seconds onlyIfChanged=True, - reason="elfutils periodic project master branch snapshot", + reason="elfutils periodic project main branch snapshot", builderNames=["elfutils-snapshots-coverage"]) c['schedulers'].append(elfutils_snapshot_scheduler) -- 2.41.0