From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 82B50C433DB for ; Wed, 13 Jan 2021 17:43:38 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id ABE3D23406 for ; Wed, 13 Jan 2021 17:43:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org ABE3D23406 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:38752 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kzkBD-0005nJ-QM for qemu-devel@archiver.kernel.org; Wed, 13 Jan 2021 12:43:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43250) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kzjyW-0005m4-U4 for qemu-devel@nongnu.org; Wed, 13 Jan 2021 12:30:30 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:37189) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kzjyP-0007xM-9S for qemu-devel@nongnu.org; Wed, 13 Jan 2021 12:30:27 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1610559018; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xvZeJAMTAHMe2TEwil0L38FR9qdrQ8AtRhJ6+He/B0k=; b=iDw9loRAVhM4JAuO1RJ9LUW6SRUzyh3EqIpbUy8J0a01iSoud8SDqv1p30A2fSf3fENiyH eay1/If/CZDXIgMZUHwHUPwlQhGjv+wiTOOZ8G26qfbnAb+qYqujNAQfTozpv6IJHxafkf xEonLH6O9FjRwTvQn8W/ljXPRn1zzO8= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-503-iMNUboG1NRKdxFxbSWV9LA-1; Wed, 13 Jan 2021 12:30:17 -0500 X-MC-Unique: iMNUboG1NRKdxFxbSWV9LA-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CBA57A0C06; Wed, 13 Jan 2021 17:30:14 +0000 (UTC) Received: from wainer-laptop.localdomain (ovpn-116-88.gru2.redhat.com [10.97.116.88]) by smtp.corp.redhat.com (Postfix) with ESMTP id 89CBA5B4CE; Wed, 13 Jan 2021 17:30:11 +0000 (UTC) Subject: Re: [PATCH v1 9/9] gitlab: move docs and tools build across from Travis To: =?UTF-8?Q?Alex_Benn=c3=a9e?= , qemu-devel@nongnu.org References: <20210113151408.27939-1-alex.bennee@linaro.org> <20210113151408.27939-10-alex.bennee@linaro.org> From: Wainer dos Santos Moschetta Message-ID: <02c20583-35c8-0e6f-0a1d-8b9fc1142a6b@redhat.com> Date: Wed, 13 Jan 2021 14:30:08 -0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.4.0 MIME-Version: 1.0 In-Reply-To: <20210113151408.27939-10-alex.bennee@linaro.org> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=wainersm@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US Received-SPF: pass client-ip=216.205.24.124; envelope-from=wainersm@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.25, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Thomas Huth , =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 1/13/21 12:14 PM, Alex Bennée wrote: > While we are at it we might as well check the tag generation. For > bonus points we run GNU globals htags into the public pages directory > for publishing with the auto generated pages. > > Signed-off-by: Alex Bennée > --- > .gitlab-ci.yml | 22 ++++++++++++++++------ > .travis.yml | 16 ---------------- > 2 files changed, 16 insertions(+), 22 deletions(-) > > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml > index 4532f1718a..c07064a4f7 100644 > --- a/.gitlab-ci.yml > +++ b/.gitlab-ci.yml > @@ -79,7 +79,6 @@ build-system-ubuntu: > TARGETS: aarch64-softmmu alpha-softmmu cris-softmmu hppa-softmmu > moxie-softmmu microblazeel-softmmu mips64el-softmmu > MAKE_CHECK_ARGS: check-build > - CONFIGURE_ARGS: --enable-docs > artifacts: > expire_in: 2 days > paths: > @@ -111,7 +110,6 @@ build-system-debian: > TARGETS: arm-softmmu avr-softmmu i386-softmmu mipsel-softmmu > riscv64-softmmu sh4eb-softmmu sparc-softmmu xtensaeb-softmmu > MAKE_CHECK_ARGS: check-build > - CONFIGURE_ARGS: --enable-docs > artifacts: > expire_in: 2 days > paths: > @@ -126,6 +124,17 @@ check-system-debian: > IMAGE: debian-amd64 > MAKE_CHECK_ARGS: check > > +build-tools-and-docs-debian: > + <<: *native_build_job_definition > + variables: > + IMAGE: debian-amd64 > + MAKE_CHECK_ARGS: ctags gtags TAGS cscope > + CONFIGURE_ARGS: --enable-docs --enable-tools > + artifacts: > + expire_in: 2 days > + paths: > + - build > + > acceptance-system-debian: > <<: *native_test_job_definition > needs: > @@ -597,13 +606,14 @@ build-libvhost-user: > - ninja > > pages: > - image: $CI_REGISTRY_IMAGE/qemu/ubuntu2004:latest > + image: $CI_REGISTRY_IMAGE/qemu/debian-amd64:latest > stage: test > needs: > - - job: build-system-ubuntu > - artifacts: true > + - job: build-tools-and-docs-debian > script: Just for the records: artifacts is true by default. > - - mkdir public > + - mkdir -p public/src > + - htags --suggest --tree-view=filetree -m qemu_init > + -t "Welcome to the QEMU source code" public/src > - mv build/docs/index.html public/ > - for i in devel interop specs system tools user ; do mv build/docs/$i public/ ; done > artifacts: > diff --git a/.travis.yml b/.travis.yml > index f2a101936c..3b574a5968 100644 > --- a/.travis.yml > +++ b/.travis.yml > @@ -148,22 +148,6 @@ jobs: > - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default" > > > - # Check we can build docs and tools (out of tree) > - - name: "tools and docs (bionic)" > - dist: bionic > - env: > - - BUILD_DIR="out-of-tree/build/dir" SRC_DIR="../../.." > - - BASE_CONFIG="--enable-tools --enable-docs" > - - CONFIG="--target-list=x86_64-softmmu,aarch64-linux-user" > - - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default" > - addons: > - apt: > - packages: > - - ninja-build > - - python3-sphinx > - - perl > - > - > # Test with Clang for compile portability (Travis uses clang-5.0) > - name: "Clang (user)" > env: Reviewed-by: Wainer dos Santos Moschetta