From ea860973592bc218852f3075a65b7de73fb2957e Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Tue, 18 Feb 2020 22:20:04 +0100 Subject: [PATCH] ci: remove redundant configs disabling kmods The kernel modules are not built by default since below commit. The Travis CI matrix can be simplified by removing the redundant option enable_kmods=false, and by removing some jobs which are redundant. Note: there is no benefit in checking kmods in Travis Ubuntu. Anyway different kernel versions and distributions are needed, and the Technical Board is looking at moving the Linux kmods out of this repository. Fixes: 91a861e54164 ("config: disable Linux kernel modules by default") Signed-off-by: Thomas Monjalon Acked-by: Aaron Conole Acked-by: David Marchand --- .travis.yml | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/.travis.yml b/.travis.yml index 030064c943..84c4ea6ac2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,8 +42,6 @@ before_install: ./.ci/${TRAVIS_OS_NAME}-setup.sh env: - DEF_LIB="static" - DEF_LIB="shared" - - DEF_LIB="static" OPTS="-Denable_kmods=false" - - DEF_LIB="shared" OPTS="-Denable_kmods=false" - DEF_LIB="shared" RUN_TESTS=1 matrix: @@ -54,13 +52,13 @@ matrix: apt: packages: - *build_32b_packages - - env: DEF_LIB="static" OPTS="-Denable_kmods=false" AARCH64=1 + - env: DEF_LIB="static" AARCH64=1 compiler: gcc addons: apt: packages: - *aarch64_packages - - env: DEF_LIB="shared" OPTS="-Denable_kmods=false" AARCH64=1 + - env: DEF_LIB="shared" AARCH64=1 compiler: gcc addons: apt: @@ -79,13 +77,7 @@ matrix: packages: - *extra_packages - *doc_packages - - env: DEF_LIB="static" OPTS="-Denable_kmods=false" EXTRA_PACKAGES=1 - compiler: gcc - addons: - apt: - packages: - - *extra_packages - - env: DEF_LIB="shared" OPTS="-Denable_kmods=false" EXTRA_PACKAGES=1 + - env: DEF_LIB="static" EXTRA_PACKAGES=1 compiler: gcc addons: apt: @@ -110,18 +102,6 @@ matrix: packages: - *extra_packages - *doc_packages - - env: DEF_LIB="static" OPTS="-Denable_kmods=false" EXTRA_PACKAGES=1 - compiler: clang - addons: - apt: - packages: - - *extra_packages - - env: DEF_LIB="shared" OPTS="-Denable_kmods=false" EXTRA_PACKAGES=1 - compiler: clang - addons: - apt: - packages: - - *extra_packages - env: DEF_LIB="static" arch: arm64 compiler: gcc @@ -150,7 +130,7 @@ matrix: apt: packages: - *required_packages - - env: DEF_LIB="shared" OPTS="-Denable_kmods=false" BUILD_DOCS=1 + - env: DEF_LIB="shared" BUILD_DOCS=1 arch: arm64 compiler: gcc addons: -- 2.20.1