From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id BD4006DE0A89 for ; Thu, 17 Aug 2017 10:54:27 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: -0.068 X-Spam-Level: X-Spam-Status: No, score=-0.068 tagged_above=-999 required=5 tests=[AWL=-0.107, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.211, SPF_PASS=-0.001] autolearn=disabled Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id VmNjCynx3ZkH for ; Thu, 17 Aug 2017 10:54:26 -0700 (PDT) Received: from mail-wr0-f171.google.com (mail-wr0-f171.google.com [209.85.128.171]) by arlo.cworth.org (Postfix) with ESMTPS id 909056DE0A9A for ; Thu, 17 Aug 2017 10:54:21 -0700 (PDT) Received: by mail-wr0-f171.google.com with SMTP id 5so25712112wrz.5 for ; Thu, 17 Aug 2017 10:54:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=AVInC3jtvPJCyIQbILXC2+D+JAs+lgjESZhptV1byUk=; b=O035IJbGx+O70qdTWSWDADont0ZnRUixXQKRvvCLjXguypTjVYc+/Er377z19Z9plO ag/nwku1qiFrOYgXLSJPwIWXBUg26OjYQfhCELbrjzPC2GZn9gMjKxkW4iU1wFNdHymq 1qtDK/tWJaY0vcydiRftGaLCpX6Vkle6Gme9TUv3q+1demL+dlNhr2uD1+bWZzX6J5dH m1R7FlGsznPqyDjgw7LHYr96QtjPyg9fouxOZ5iLDY2pHNcbpax81VRiCODBGiwNuoE8 f5P0wsaD+dSm1+1akbf9hf37JpGqxOcnvpsTcWeEXRHE3oR87lsiSeq+kq+SpQFMujiS ezpw== X-Gm-Message-State: AHYfb5iBdGJV+6mUpHnRIaObvrM6y+jSSAiDy/WupZG06vJEkB9gSV11 af0vRNsptumx2se2hiE= X-Received: by 10.223.166.173 with SMTP id t42mr4243042wrc.272.1502992459961; Thu, 17 Aug 2017 10:54:19 -0700 (PDT) Received: from home.thecybershadow.net ([89.28.117.31]) by smtp.gmail.com with ESMTPSA id c34sm4345025wra.80.2017.08.17.10.54.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Aug 2017 10:54:19 -0700 (PDT) From: Vladimir Panteleev To: notmuch@notmuchmail.org Subject: [PATCH 3/7] .travis.yml: Replace manual zlib installation with "dist: trusty" Date: Thu, 17 Aug 2017 17:51:41 +0000 Message-Id: <20170817175145.3204-4-notmuch@thecybershadow.net> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170817175145.3204-1-notmuch@thecybershadow.net> References: <20170817175145.3204-1-notmuch@thecybershadow.net> X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Aug 2017 17:54:27 -0000 Travis now offers Ubuntu Trusty (14.04 LTS) VMs as test runners, which is gradually becoming the default. We can opt in to using Trusty now so that we no longer need to manually update zlib to a newer version. --- .travis.yml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 505c4e22..e297e516 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,17 +1,12 @@ language: c + +dist: trusty +sudo: required + before_install: - sudo apt-get update -qq - sudo apt-get install dtach libxapian-dev libgmime-2.6-dev libtalloc-dev python-sphinx gdb gpgsm - # Notmuch requires zlib 1.2.5.2, unfortunately travis runs on Ubuntu 12.04LTS which - # ships with zlib 1.2.3.3. We need to update to zlib 1.2.5.2 to be able to build. - # TODO: Watch https://github.com/travis-ci/travis-ci/issues/2046 and remove - # this hack once travis-ci switches to Ubuntu 14.04 - - wget 'https://github.com/notmuch/travis-files/raw/master/zlib1g-dev_1.2.8.dfsg-1ubuntu1_amd64.deb' - - wget 'https://github.com/notmuch/travis-files/raw/master/zlib1g_1.2.8.dfsg-1ubuntu1_amd64.deb' - - sudo dpkg -i zlib1g-dev_1.2.8.dfsg-1ubuntu1_amd64.deb zlib1g_1.2.8.dfsg-1ubuntu1_amd64.deb - - sudo apt-get install -f - script: - ./configure - make download-test-databases -- 2.13.3