From patchwork Sat Sep 23 13:45:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Iooss X-Patchwork-Id: 9967561 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id F2337602D8 for ; Sat, 23 Sep 2017 13:49:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D800226E1A for ; Sat, 23 Sep 2017 13:49:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CB42528BE5; Sat, 23 Sep 2017 13:49:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from uhil19pa09.eemsg.mail.mil (uhil19pa09.eemsg.mail.mil [214.24.21.82]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B0FF228B99 for ; Sat, 23 Sep 2017 13:49:26 +0000 (UTC) Received: from emsm-gh1-uea10.ncsc.mil ([214.29.60.2]) by uhil19pa09.eemsg.mail.mil with ESMTP/TLS/AES256-SHA; 23 Sep 2017 13:49:01 +0000 Received: from unknown (HELO tarius.tycho.ncsc.mil) ([144.51.242.1]) by EMSM-GH1-UEA10.NCSC.MIL with ESMTP; 23 Sep 2017 13:48:59 +0000 Received: from prometheus.infosec.tycho.ncsc.mil (prometheus [192.168.25.40]) by tarius.tycho.ncsc.mil (8.14.4/8.14.4) with ESMTP id v8NDmPb1017803; Sat, 23 Sep 2017 09:48:30 -0400 Received: from tarius.tycho.ncsc.mil (tarius.infosec.tycho.ncsc.mil [144.51.242.1]) by prometheus.infosec.tycho.ncsc.mil (8.15.2/8.15.2) with ESMTP id v8NDmM4l132654 for ; Sat, 23 Sep 2017 09:48:22 -0400 Received: from goalie.tycho.ncsc.mil (goalie [144.51.242.250]) by tarius.tycho.ncsc.mil (8.14.4/8.14.4) with ESMTP id v8NDmMIN017801 for ; Sat, 23 Sep 2017 09:48:22 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A1BTAwAtZcZZfyobGNZcg18oZ24njwqpQ?= =?us-ascii?q?xMSiTxXAQIBAQEBAQITAQELFohGGYhIgVIDAQELl2SOXBGDSoQRhzyDK4ICgVG?= =?us-ascii?q?BZ44eBaEfgi6FL4xygiBbkBiKCos8gTmBZTIhMoMigXkBCwF4gVB0AYgpAQEB?= X-IPAS-Result: =?us-ascii?q?A1BTAwAtZcZZfyobGNZcg18oZ24njwqpQxMSiTxXAQIBAQE?= =?us-ascii?q?BAQITAQELFohGGYhIgVIDAQELl2SOXBGDSoQRhzyDK4ICgVGBZ44eBaEfgi6FL?= =?us-ascii?q?4xygiBbkBiKCos8gTmBZTIhMoMigXkBCwF4gVB0AYgpAQEB?= X-IronPort-AV: E=Sophos;i="5.42,429,1500955200"; d="scan'208";a="61836" Received: from emsm-gh1-uea11.ncsc.mil ([214.29.60.35]) by goalie.tycho.ncsc.mil with ESMTP; 23 Sep 2017 09:48:21 -0400 Received: from updc3cpa03.eemsg.mail.mil ([214.24.27.42]) by emsm-gh1-uea11.NCSC.MIL with ESMTP; 23 Sep 2017 13:48:20 +0000 X-EEMSG-check-005: 0 X-EEMSG-check-006: 000-001;78803926-cc42-4297-83ff-23030c2bc558 Authentication-Results: UPDC3CPA05.eemsg.mail.mil; dkim=neutral (message not signed) header.i=none X-EEMSG-check-008: 76952180|UPDC3CPA05_EEMSG_MP21.csd.disa.mil X-EEMSG-check-001: false X-EEMSG-SBRS: 3.5 X-EEMSG-ORIG-IP: 129.104.30.34 X-EEMSG-check-002: true X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A0AFAwDZYsZZhyIeaIFcHQYMgzCBD24njwqpQxMSiTxDFAECAQEBAQEBARMBAQEKCwkIKC+HaRmISIFSBAELpkARg0qEEYc8gyuCAoFRgWeOHgWhH4IuhS+McoIgW5AYigqLPIE5NoEvMiEygyKBeQELAYJIdAGIKQEBAQ X-IPAS-Result: A0AFAwDZYsZZhyIeaIFcHQYMgzCBD24njwqpQxMSiTxDFAECAQEBAQEBARMBAQEKCwkIKC+HaRmISIFSBAELpkARg0qEEYc8gyuCAoFRgWeOHgWhH4IuhS+McoIgW5AYigqLPIE5NoEvMiEygyKBeQELAYJIdAGIKQEBAQ Received: from mx1.polytechnique.org ([129.104.30.34]) by UPDC3CPA05.eemsg.mail.mil with ESMTP; 23 Sep 2017 13:48:19 +0000 Received: from localhost.localdomain (32.206.133.77.rev.sfr.net [77.133.206.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ssl.polytechnique.org (Postfix) with ESMTPSA id EBC3E56472C for ; Sat, 23 Sep 2017 15:46:43 +0200 (CEST) From: Nicolas Iooss To: selinux@tycho.nsa.gov Date: Sat, 23 Sep 2017 15:45:53 +0200 Message-Id: <20170923134553.2098-1-nicolas.iooss@m4x.org> X-Mailer: git-send-email 2.14.1 X-AV-Checked: ClamAV using ClamSMTP at svoboda.polytechnique.org (Sat Sep 23 15:46:44 2017 +0200 (CEST)) X-Org-Mail: nicolas.iooss.2010@polytechnique.org Subject: [PATCH 1/1] Travis-CI: fix configuration after September's update X-BeenThere: selinux@tycho.nsa.gov X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Security-Enhanced Linux \(SELinux\) mailing list" List-Post: List-Help: Errors-To: selinux-bounces@tycho.nsa.gov Sender: "Selinux" X-Virus-Scanned: ClamAV using ClamSMTP The latest update to Travis-CI build environment splitted sugilite environment into amethyst and garnet and deprecated sugilite. As garnet provides tools for languages C and Python, and as it is automatically selected according to https://travis-ci.org/fishilico/selinux/jobs/278927391 , remove "group: sugilite" from Travis-CI configuration file. This update introduced two issues: - Ruby 2.1 is no longer provided. As it has reached End Of Life according to https://www.ruby-lang.org/en/downloads/, remove it from the tested versions - Python 3.3, 3.4 and 3.5 are no longer installed by default. When Travis-CI builds Python projects using these versions, it automatically download and extract an archive from https://s3.amazonaws.com/travis-python-archives/binaries/ubuntu/14.04/x86_64/. Implement this process in .travis.yml directly (because Travis-CI does not support multi-language projects which use several versions of C compilers and Python and Ruby interpreters). Last but not least, it is now possible to build with PyPy3. Enable this interpreter in the build environment matrix. More information about the Travis-CI update is available at https://docs.travis-ci.com/user/build-environment-updates/2017-09-06/ Signed-off-by: Nicolas Iooss --- .travis.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1b761496dd12..e21b4d2198e5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,11 +21,10 @@ env: - PYVER=python3.3 RUBYLIBVER=2.4 - PYVER=python3.4 RUBYLIBVER=2.4 - PYVER=python3.5 RUBYLIBVER=2.4 - - PYVER=pypy2 RUBYLIBVER=2.4 - #- PYVER=pypy3 RUBYLIBVER=2.3 # PyPy3 5.5.0 provides the Python2 form of some structures, which makes it incompatible with SWIG + - PYVER=pypy RUBYLIBVER=2.4 + - PYVER=pypy3 RUBYLIBVER=2.4 # Test several Ruby versions - - PYVER=python3.6 RUBYLIBVER=2.1 - PYVER=python3.6 RUBYLIBVER=2.2 - PYVER=python3.6 RUBYLIBVER=2.3 @@ -39,7 +38,6 @@ matrix: # Use Travis-CI Ubuntu 14.04 Trusty infrastructure, "full image" variant sudo: required dist: trusty -group: sugilite # Install SELinux userspace utilities dependencies addons: @@ -76,6 +74,14 @@ install: # Make sepolgen tests work without really installing anything in the real root (doing this would conflict with Ubuntu packages) - sed -e "s,\"\(/usr/bin/[cs]\),\"$TRAVIS_BUILD_DIR/installdir\1," -i python/sepolgen/src/sepolgen/module.py + # Download the required python version if it is not installed + - VIRTUAL_ENV="$HOME/virtualenv/$PYVER" + - if ! [ -d "$VIRTUAL_ENV" ] ; then + curl -o python.tar.bz2 "https://s3.amazonaws.com/travis-python-archives/binaries/ubuntu/14.04/x86_64/${PYVER/python/python-}.tar.bz2" && + sudo tar xjf python.tar.bz2 --directory / && + rm python.tar.bz2 ; + fi + before_script: # clang on Travis-CI 14.04 environment is too old to support -Wdouble-promotion - if "$CC" --version |grep -q clang; then sed 's/ -Wdouble-promotion / /' -i libselinux/src/Makefile libselinux/utils/Makefile ; fi