From patchwork Wed Feb 19 19:41:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 65925 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 88918A0555; Wed, 19 Feb 2020 20:41:55 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 290BB1BF87; Wed, 19 Feb 2020 20:41:51 +0100 (CET) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by dpdk.org (Postfix) with ESMTP id B2B043B5 for ; Wed, 19 Feb 2020 20:41:47 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582141307; 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=j1LOBRdjyeDuOZY85NVtTecTbsW0+/GZtHt65pwUFBk=; b=g8aPoo8C4fsDQHy92lFP3sePRaRH5cSC7vEQ47SxKLpLSehPEqFFSqxysGccmb9lLvZP6t sAOgYgFil4U5J5uGvPwEK2PaCm/013P2g9Wn2gNBjCIswtECXSAt7TkB2+xNdWdEKbP3ag gABsUAkatBE9gP2L2fgE29Z9b443hxE= 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-367-KUsPDLYSPVKNzBG_OhTnWw-1; Wed, 19 Feb 2020 14:41:45 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1C3E8107ACC9; Wed, 19 Feb 2020 19:41:44 +0000 (UTC) Received: from dmarchan.remote.csb (ovpn-204-34.brq.redhat.com [10.40.204.34]) by smtp.corp.redhat.com (Postfix) with ESMTP id C4D911001B09; Wed, 19 Feb 2020 19:41:42 +0000 (UTC) From: David Marchand To: thomas@monjalon.net, aconole@redhat.com Cc: dev@dpdk.org, Michael Santana Date: Wed, 19 Feb 2020 20:41:28 +0100 Message-Id: <20200219194131.29417-2-david.marchand@redhat.com> In-Reply-To: <20200219194131.29417-1-david.marchand@redhat.com> References: <20200219194131.29417-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: KUsPDLYSPVKNzBG_OhTnWw-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [dpdk-dev] [PATCH 1/4] ci: remove unnecessary dependency on Linux headers X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Following removal of kmod compilation, we don't need to install linux-headers anymore. Fixes: ea860973592b ("ci: remove redundant configs disabling kmods") Signed-off-by: David Marchand Acked-by: Thomas Monjalon Acked-by: Aaron Conole --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1d43f16ae..671447ee8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ addons: apt: update: true packages: &required_packages - - [libnuma-dev, linux-headers-$(uname -r), python3-setuptools, python3-wheel, python3-pip, ninja-build] + - [libnuma-dev, python3-setuptools, python3-wheel, python3-pip, ninja-build] aarch64_packages: &aarch64_packages - *required_packages From patchwork Wed Feb 19 19:41:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 65927 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id D5961A0555; Wed, 19 Feb 2020 20:42:10 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 49B831BFA1; Wed, 19 Feb 2020 20:41:57 +0100 (CET) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by dpdk.org (Postfix) with ESMTP id A2C8B1B13C for ; Wed, 19 Feb 2020 20:41:54 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582141314; 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=ySrLV8BtKPkDf1hDNc+O4/sbikF0uEd1lltwsSgHWec=; b=GaVKJsmL62l6ZUnIlD4cFPRLgw5EbK8BIRlzoK4GZhtZktcO71ZFBQqbVIWhrK4wimynSi Apa+rd0DoH9xd0VvfVLvS0tOsp6B3X7kxUlKPQu383gJ5fCj8kCmV3no/5qjQyT9F4Ehy4 c6kbyc69POZb5dJu2ndJVugMbev15Nc= 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-379-fePCOcbHM9CgpDVk0c5ARw-1; Wed, 19 Feb 2020 14:41:47 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8840FDB23; Wed, 19 Feb 2020 19:41:46 +0000 (UTC) Received: from dmarchan.remote.csb (ovpn-204-34.brq.redhat.com [10.40.204.34]) by smtp.corp.redhat.com (Postfix) with ESMTP id 427F11001B09; Wed, 19 Feb 2020 19:41:45 +0000 (UTC) From: David Marchand To: thomas@monjalon.net, aconole@redhat.com Cc: dev@dpdk.org, Michael Santana Date: Wed, 19 Feb 2020 20:41:29 +0100 Message-Id: <20200219194131.29417-3-david.marchand@redhat.com> In-Reply-To: <20200219194131.29417-1-david.marchand@redhat.com> References: <20200219194131.29417-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: fePCOcbHM9CgpDVk0c5ARw-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [dpdk-dev] [PATCH 2/4] ci: fix Travis config warnings X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Reading https://config.travis-ci.com/ and using https://config.travis-ci.com/explore to check changes, we can cleanup some warnings reported by the config validation options in Travis. Signed-off-by: David Marchand Acked-by: Aaron Conole --- .travis.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 671447ee8..7c1b2ff1b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,22 +19,22 @@ addons: packages: &required_packages - [libnuma-dev, python3-setuptools, python3-wheel, python3-pip, ninja-build] -aarch64_packages: &aarch64_packages +_aarch64_packages: &aarch64_packages - *required_packages - [gcc-aarch64-linux-gnu, libc6-dev-arm64-cross, pkg-config-aarch64-linux-gnu] -extra_packages: &extra_packages +_extra_packages: &extra_packages - *required_packages - [libbsd-dev, libpcap-dev, libibverbs-dev, libcrypto++-dev, libfdt-dev, libjansson4] -libabigail_build_packages: &libabigail_build_packages +_libabigail_build_packages: &libabigail_build_packages - [autoconf, automake, libtool, pkg-config, libxml2-dev, libdw-dev] -build_32b_packages: &build_32b_packages +_build_32b_packages: &build_32b_packages - *required_packages - [gcc-multilib] -doc_packages: &doc_packages +_doc_packages: &doc_packages - [doxygen, graphviz, python3-sphinx] before_install: ./.ci/${TRAVIS_OS_NAME}-setup.sh @@ -44,7 +44,7 @@ env: - DEF_LIB="shared" - DEF_LIB="shared" RUN_TESTS=1 -matrix: +jobs: include: - env: DEF_LIB="static" BUILD_32BIT=1 compiler: gcc From patchwork Wed Feb 19 19:41:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 65926 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id F0231A0555; Wed, 19 Feb 2020 20:42:03 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 73CD91BF9A; Wed, 19 Feb 2020 20:41:55 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id E4FEF1B13C for ; Wed, 19 Feb 2020 20:41:53 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582141313; 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=fhkFvOrZUaPYHjmx4K00GTlXrxg0TWHalqzLNTR6U3s=; b=XuRoObIDZU53oQJFJchsjP6QAlbRet2WCXTRb9Q2LeZkKcmeCtCjTZfGK6u5mYC/dD4Xn5 U+F0/8PE+fJ5vUhxBpELw11uCTThi2xM0nsi7ycWYl/3Fz8zGrrI/K9bwWeVxWuLK6Nvns x9KnMtMLRQja7xSejaF/FjrD9L0AiRw= 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-377-1X5IMWVxPjWTtO3zQ6LvWQ-1; Wed, 19 Feb 2020 14:41:50 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1651D1005510; Wed, 19 Feb 2020 19:41:49 +0000 (UTC) Received: from dmarchan.remote.csb (ovpn-204-34.brq.redhat.com [10.40.204.34]) by smtp.corp.redhat.com (Postfix) with ESMTP id C82281001B09; Wed, 19 Feb 2020 19:41:47 +0000 (UTC) From: David Marchand To: thomas@monjalon.net, aconole@redhat.com Cc: dev@dpdk.org, Michael Santana Date: Wed, 19 Feb 2020 20:41:30 +0100 Message-Id: <20200219194131.29417-4-david.marchand@redhat.com> In-Reply-To: <20200219194131.29417-1-david.marchand@redhat.com> References: <20200219194131.29417-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: 1X5IMWVxPjWTtO3zQ6LvWQ-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [dpdk-dev] [PATCH 3/4] ci: use an explicit list of Travis jobs X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Maintaining the .travis.yml requires some knowledge of how Travis computes the jobs list (combination of os: arch: compiler: etc...). Let's switch to an explicit list to find all jobs at a glance. To enhance readability, jobs have been sorted per arch/compiler with comments to isolate blocks. Setting required_packages for aarch64 native jobs is unnecessary, the global addons: values are the same. This commit does not change the jobs list (21 jobs in total). Signed-off-by: David Marchand Acked-by: Thomas Monjalon Acked-by: Aaron Conole --- .travis.yml | 102 ++++++++++++++++++++++++++-------------------------- 1 file changed, 52 insertions(+), 50 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7c1b2ff1b..c174d5f30 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,17 +1,14 @@ +# default values for all jobs language: c cache: ccache: true directories: - libabigail - reference -compiler: - - gcc - - clang dist: bionic -os: - - linux +os: linux addons: apt: @@ -38,98 +35,105 @@ _doc_packages: &doc_packages - [doxygen, graphviz, python3-sphinx] before_install: ./.ci/${TRAVIS_OS_NAME}-setup.sh - -env: - - DEF_LIB="static" - - DEF_LIB="shared" - - DEF_LIB="shared" RUN_TESTS=1 +script: ./.ci/${TRAVIS_OS_NAME}-build.sh jobs: include: - - env: DEF_LIB="static" BUILD_32BIT=1 + # x86_64 gcc jobs + - env: DEF_LIB="static" + arch: amd64 compiler: gcc - addons: - apt: - packages: - - *build_32b_packages - - env: DEF_LIB="static" AARCH64=1 + - env: DEF_LIB="shared" + arch: amd64 compiler: gcc - addons: - apt: - packages: - - *aarch64_packages - - env: DEF_LIB="shared" AARCH64=1 + - env: DEF_LIB="shared" RUN_TESTS=1 + arch: amd64 compiler: gcc - addons: - apt: - packages: - - *aarch64_packages - env: DEF_LIB="static" EXTRA_PACKAGES=1 + arch: amd64 compiler: gcc addons: apt: packages: - *extra_packages - env: DEF_LIB="shared" EXTRA_PACKAGES=1 RUN_TESTS=1 BUILD_DOCS=1 + arch: amd64 compiler: gcc addons: apt: packages: - *extra_packages - *doc_packages - - env: DEF_LIB="static" EXTRA_PACKAGES=1 + - env: DEF_LIB="shared" EXTRA_PACKAGES=1 ABI_CHECKS=1 + arch: amd64 compiler: gcc addons: apt: packages: - *extra_packages + - *libabigail_build_packages + # x86_64 clang jobs + - env: DEF_LIB="static" + arch: amd64 + compiler: clang + - env: DEF_LIB="shared" + arch: amd64 + compiler: clang + - env: DEF_LIB="shared" RUN_TESTS=1 + arch: amd64 + compiler: clang - env: DEF_LIB="static" EXTRA_PACKAGES=1 + arch: amd64 compiler: clang addons: apt: packages: - *extra_packages - env: DEF_LIB="shared" EXTRA_PACKAGES=1 + arch: amd64 compiler: clang addons: apt: packages: - *extra_packages - env: DEF_LIB="shared" EXTRA_PACKAGES=1 RUN_TESTS=1 BUILD_DOCS=1 + arch: amd64 compiler: clang addons: apt: packages: - *extra_packages - *doc_packages - - env: DEF_LIB="static" - arch: arm64 + # x86_64 cross-compiling 32-bits jobs + - env: DEF_LIB="static" BUILD_32BIT=1 + arch: amd64 compiler: gcc addons: apt: packages: - - *required_packages - - env: DEF_LIB="shared" - arch: arm64 + - *build_32b_packages + # x86_64 cross-compiling aarch64 jobs + - env: DEF_LIB="static" AARCH64=1 + arch: amd64 compiler: gcc addons: apt: packages: - - *required_packages - - env: DEF_LIB="static" - arch: arm64 - compiler: clang + - *aarch64_packages + - env: DEF_LIB="shared" AARCH64=1 + arch: amd64 + compiler: gcc addons: apt: packages: - - *required_packages + - *aarch64_packages + # aarch64 gcc jobs + - env: DEF_LIB="static" + arch: arm64 + compiler: gcc - env: DEF_LIB="shared" arch: arm64 - compiler: clang - addons: - apt: - packages: - - *required_packages + compiler: gcc - env: DEF_LIB="shared" BUILD_DOCS=1 arch: arm64 compiler: gcc @@ -138,13 +142,6 @@ jobs: packages: - *required_packages - *doc_packages - - env: DEF_LIB="shared" EXTRA_PACKAGES=1 ABI_CHECKS=1 - compiler: gcc - addons: - apt: - packages: - - *extra_packages - - *libabigail_build_packages - env: DEF_LIB="shared" EXTRA_PACKAGES=1 ABI_CHECKS=1 arch: arm64 compiler: gcc @@ -153,5 +150,10 @@ jobs: packages: - *extra_packages - *libabigail_build_packages - -script: ./.ci/${TRAVIS_OS_NAME}-build.sh + # aarch64 clang jobs + - env: DEF_LIB="static" + arch: arm64 + compiler: clang + - env: DEF_LIB="shared" + arch: arm64 + compiler: clang From patchwork Wed Feb 19 19:41:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 65928 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 08A03A0555; Wed, 19 Feb 2020 20:42:22 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 149761BFAD; Wed, 19 Feb 2020 20:42:00 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id 2ACB11BF9F for ; Wed, 19 Feb 2020 20:41:57 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582141316; 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=FiWRqDDGsssEX6XU3vJcZCr5MgeEamsfC2auAxPcPjU=; b=QUJf6PsoP/gG5nQJZKsdpgr7ljopnmDgFK8xyl3efk/v6pvlqmmOSMgii4lPbWQGM28/Aj eYQQZU/viYag0PHpns5wjkK4I45E0O+VdAJOI7U1grHM5pUjOb7ECPcH/47ru0nlF2s3MN b3UPcovfv/SZaURJZNmCcM7KsC/x2vc= 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-38-Qd7LhIu-M06Mpbsxmm_pxA-1; Wed, 19 Feb 2020 14:41:52 -0500 X-MC-Unique: Qd7LhIu-M06Mpbsxmm_pxA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A68AE477; Wed, 19 Feb 2020 19:41:51 +0000 (UTC) Received: from dmarchan.remote.csb (ovpn-204-34.brq.redhat.com [10.40.204.34]) by smtp.corp.redhat.com (Postfix) with ESMTP id 629841001B09; Wed, 19 Feb 2020 19:41:50 +0000 (UTC) From: David Marchand To: thomas@monjalon.net, aconole@redhat.com Cc: dev@dpdk.org, Michael Santana Date: Wed, 19 Feb 2020 20:41:31 +0100 Message-Id: <20200219194131.29417-5-david.marchand@redhat.com> In-Reply-To: <20200219194131.29417-1-david.marchand@redhat.com> References: <20200219194131.29417-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [dpdk-dev] [PATCH 4/4] ci: reorganise Travis jobs X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Let's prune the jobs list to limit the amount of time spent by the robot in Travis. Since meson enables automatically the relevant components, there is not much gain in testing with extra_packages vs required_packages only. For a given arch/compiler/env combination, compilation is first tested in all jobs that run tests or build the docs or run the ABI checks. In the same context, for jobs that accumulates running tests, building the docs etc..., those steps are independent and can be split to save some cpu on Travis. With this, we go down from 21 to 15 jobs. Note: this patch requires a flush of the existing caches in Travis. Signed-off-by: David Marchand Acked-by: Thomas Monjalon Acked-by: Aaron Conole --- .travis.yml | 51 +++++++++------------------------------------------ 1 file changed, 9 insertions(+), 42 deletions(-) diff --git a/.travis.yml b/.travis.yml index c174d5f30..b64a81bd0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,15 +15,12 @@ addons: update: true packages: &required_packages - [libnuma-dev, python3-setuptools, python3-wheel, python3-pip, ninja-build] + - [libbsd-dev, libpcap-dev, libibverbs-dev, libcrypto++-dev, libfdt-dev, libjansson4] _aarch64_packages: &aarch64_packages - *required_packages - [gcc-aarch64-linux-gnu, libc6-dev-arm64-cross, pkg-config-aarch64-linux-gnu] -_extra_packages: &extra_packages - - *required_packages - - [libbsd-dev, libpcap-dev, libibverbs-dev, libcrypto++-dev, libfdt-dev, libjansson4] - _libabigail_build_packages: &libabigail_build_packages - [autoconf, automake, libtool, pkg-config, libxml2-dev, libdw-dev] @@ -43,66 +40,39 @@ jobs: - env: DEF_LIB="static" arch: amd64 compiler: gcc - - env: DEF_LIB="shared" - arch: amd64 - compiler: gcc - env: DEF_LIB="shared" RUN_TESTS=1 arch: amd64 compiler: gcc - - env: DEF_LIB="static" EXTRA_PACKAGES=1 - arch: amd64 - compiler: gcc - addons: - apt: - packages: - - *extra_packages - - env: DEF_LIB="shared" EXTRA_PACKAGES=1 RUN_TESTS=1 BUILD_DOCS=1 + - env: DEF_LIB="shared" BUILD_DOCS=1 arch: amd64 compiler: gcc addons: apt: packages: - - *extra_packages + - *required_packages - *doc_packages - - env: DEF_LIB="shared" EXTRA_PACKAGES=1 ABI_CHECKS=1 + - env: DEF_LIB="shared" ABI_CHECKS=1 arch: amd64 compiler: gcc addons: apt: packages: - - *extra_packages + - *required_packages - *libabigail_build_packages # x86_64 clang jobs - env: DEF_LIB="static" arch: amd64 compiler: clang - - env: DEF_LIB="shared" - arch: amd64 - compiler: clang - env: DEF_LIB="shared" RUN_TESTS=1 arch: amd64 compiler: clang - - env: DEF_LIB="static" EXTRA_PACKAGES=1 - arch: amd64 - compiler: clang - addons: - apt: - packages: - - *extra_packages - - env: DEF_LIB="shared" EXTRA_PACKAGES=1 - arch: amd64 - compiler: clang - addons: - apt: - packages: - - *extra_packages - - env: DEF_LIB="shared" EXTRA_PACKAGES=1 RUN_TESTS=1 BUILD_DOCS=1 + - env: DEF_LIB="shared" BUILD_DOCS=1 arch: amd64 compiler: clang addons: apt: packages: - - *extra_packages + - *required_packages - *doc_packages # x86_64 cross-compiling 32-bits jobs - env: DEF_LIB="static" BUILD_32BIT=1 @@ -131,9 +101,6 @@ jobs: - env: DEF_LIB="static" arch: arm64 compiler: gcc - - env: DEF_LIB="shared" - arch: arm64 - compiler: gcc - env: DEF_LIB="shared" BUILD_DOCS=1 arch: arm64 compiler: gcc @@ -142,13 +109,13 @@ jobs: packages: - *required_packages - *doc_packages - - env: DEF_LIB="shared" EXTRA_PACKAGES=1 ABI_CHECKS=1 + - env: DEF_LIB="shared" ABI_CHECKS=1 arch: arm64 compiler: gcc addons: apt: packages: - - *extra_packages + - *required_packages - *libabigail_build_packages # aarch64 clang jobs - env: DEF_LIB="static"