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 225013858D28 for ; Sun, 9 Apr 2023 21:20:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 225013858D28 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 csb.redhat.com (deer0x03.wildebeest.org [172.31.17.133]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by gnu.wildebeest.org (Postfix) with ESMTPSA id 50C22302BB02; Sun, 9 Apr 2023 23:20:32 +0200 (CEST) Received: by csb.redhat.com (Postfix, from userid 10916) id 04F0DBCDA7; Sun, 9 Apr 2023 23:20:32 +0200 (CEST) From: Mark Wielaard To: buildbot@sourceware.org Cc: Dodji Seketeli , Mark Wielaard Subject: [PATCH] libabigail builder needs to run inside a sub build dir Date: Sun, 9 Apr 2023 23:20:30 +0200 Message-Id: <20230409212030.3002007-1-mark@klomp.org> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3036.7 required=5.0 tests=BAYES_00,GIT_PATCH_0,JMQ_SPF_NEUTRAL,KAM_DMARC_STATUS,SPF_HELO_NONE,SPF_PASS,TXREP 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: Otherwise the website isn't generated. --- builder/master.cfg | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/builder/master.cfg b/builder/master.cfg index 57d7fb8..e66804b 100644 --- a/builder/master.cfg +++ b/builder/master.cfg @@ -1015,6 +1015,16 @@ configure_step = steps.Configure( "--enable-maintainer-mode"], name="configure", haltOnFailure=True, logfiles={"config.log": "config.log"}) +# create a build subdir +mkdir_build_step = steps.ShellCommand( + command=["mkdir", "build"], + name="mkdir build") +# configure in a build subdir +build_configure_step = steps.Configure( + workdir='build/build', + command=["../configure"], + name="configure", haltOnFailure=True, + logfiles={"config.log": "config.log"}) # Sets package_version property so it can be used from a next step # Gets version from the config.h files, so needs to be run after # configure. Normally used together with package_name property as @@ -3603,9 +3613,11 @@ libabigail_rm_dist = steps.ShellCommand( name= "rm -rf libabigail-*") libabigail_make_html_doc_step = steps.Compile( + workdir="build/build", name="make html-doc", command=["make", "html-doc"]) libabigail_create_output_step = steps.ShellCommand( + workdir="build/build", name="create output", command="mkdir /home/builder/shared/output && mv ./doc/manuals/html /home/builder/shared/output/manuals && mv ./doc/api/html /home/builder/shared/output/api && mv ./doc/website/html /home/builder/shared/output/website") libabigail_create_publish_file_step = steps.ShellCommand( @@ -3642,7 +3654,8 @@ libabigail_factory_checkonly.addStep(make_distclean_step) libabigail_factory_snapshot_html_doc = util.BuildFactory() libabigail_factory_snapshot_html_doc.addStep(libabigail_git_step) libabigail_factory_snapshot_html_doc.addStep(autoreconf_step) -libabigail_factory_snapshot_html_doc.addStep(configure_step) +libabigail_factory_snapshot_html_doc.addStep(mkdir_build_step) +libabigail_factory_snapshot_html_doc.addStep(build_configure_step) libabigail_factory_snapshot_html_doc.addStep(libabigail_make_html_doc_step) libabigail_factory_snapshot_html_doc.addStep(wait_snapshots_output_ready_step) libabigail_factory_snapshot_html_doc.addStep(libabigail_create_output_step) -- 2.31.1