travis-ci: add brew cache, remove ccache

PATCH In review Ilya Shipitsin 4 participants 6 messages Jan 4, 2018 – Jan 9, 2018

Share & tools

Ilya Shipitsin

author

2018-01-04 19:37 UTC #0 lore raw

PATCH v3 1/1 travis-ci: add brew cache, remove ccache

1-2 minutes speedup osx builds by using brew cache.
Also, ccache was removed for a while (builds fail
after travis-ci upgraded clang to version 5.0.0)
---
v2: this is a "v2" of previously issued "enable ccache for osx and mingw builds" patch. I decided not to enable ccache for mingw builds as it does not speedup them

v3: removed ccache at all, because it fails on clang-5.0.0

 .travis.yml           |  2 +-
 .travis/build-deps.sh | 10 ----------
 2 files changed, 1 insertion(+), 11 deletions(-)

.travis.yml +1 -1

index 1f669b30..43217b59 100644
@@ -78,10 +78,10 @@ addons:
       - man2html
 
 cache:
-  ccache: true
   directories:
   - download-cache
   - ${HOME}/opt
+  - ${HOME}/Library/Caches/Homebrew
 
 before_install:
   - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then brew update     ; fi

.travis/build-deps.sh +0 ~~-10~~

index e787abab..bc538853 100755
@@ -130,16 +130,6 @@ build_openssl () {
     fi
 }
 
-# Enable ccache
-if [ "${TRAVIS_OS_NAME}" != "osx" ] && [ -z ${CHOST+x} ]; then
-    # ccache not available on osx, see:
-    # https://github.com/travis-ci/travis-ci/issues/5567
-    # also ccache not enabled for cross builds
-    mkdir -p "${HOME}/bin"
-    ln -s "$(which ccache)" "${HOME}/bin/${CC}"
-    PATH="${HOME}/bin:${PATH}"
-fi
-
 if [ ! -z ${CHOST+x} ]; then
       #
       # openvpn requires at least mingw-gcc-4.9, which is available at xenial repo

Signature · 1 line

2.14.3

Antonio Quartulli

2018-01-04 22:23 UTC #1 lore raw

Quoted 9 lines · Ilya Shipitsin

1-2 minutes speedup osx builds by using brew cache.
Also, ccache was removed for a while (builds fail
after travis-ci upgraded clang to version 5.0.0)
---
v2: this is a "v2" of previously issued "enable ccache for osx and mingw builds" patch. I decided not to enable ccache for mingw builds as it does not speedup them
v3: removed ccache at all, because it fails on clang-5.0.0

Does this patch make "[PATCH] travis-ci: speedup osx build by enabling brew cache" obsolete?

Regards,

Signature · 1 line

Antonio Quartulli

Илья Шипицин

author

2018-01-05 01:42 UTC #2 lore raw

2018-01-05 3:23 GMT+05:00 Antonio Quartulli <[email protected]...>:

Quoted 8 lines · Ilya Shipitsin

Quoted 5 lines
1-2 minutes speedup osx builds by using brew cache.
Also, ccache was removed for a while (builds fail
after travis-ci upgraded clang to version 5.0.0)
---
v2: this is a "v2" of previously issued "enable ccache for osx and mingw

Quoted 9 lines

builds"
Quoted 4 lines
patch. I decided not to enable ccache for mingw builds as it does not speedup them
v3: removed ccache at all, because it fails on clang-5.0.0
Does this patch make "[PATCH] travis-ci: speedup osx build by enabling brew cache" obsolete?

yes

Quoted 9 lines

Regards,
--
Antonio Quartulli

Steffan Karger

Acked-by on v3 1/1

2018-01-05 22:24 UTC #3 lore raw

In reply to Ilya Shipitsin

Hi,

Quoted 42 lines · Ilya Shipitsin

1-2 minutes speedup osx builds by using brew cache.
Also, ccache was removed for a while (builds fail
after travis-ci upgraded clang to version 5.0.0)
---
v2: this is a "v2" of previously issued "enable ccache for osx and mingw builds" patch. I decided not to enable ccache for mingw builds as it does not speedup them
v3: removed ccache at all, because it fails on clang-5.0.0
 .travis.yml           |  2 +-
 .travis/build-deps.sh | 10 ----------
 2 files changed, 1 insertion(+), 11 deletions(-)
.travis.yml +1 -1
index 1f669b30..43217b59 100644
@@ -78,10 +78,10 @@ addons:
       - man2html
 
 cache:
-  ccache: true
   directories:
   - download-cache
   - ${HOME}/opt
+  - ${HOME}/Library/Caches/Homebrew
 
 before_install:
   - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then brew update     ; fi
.travis/build-deps.sh +0 -3
index e787abab..bc538853 100755
@@ -130,16 +130,6 @@ build_openssl () {
     fi
 }
 
-# Enable ccache
-if [ "${TRAVIS_OS_NAME}" != "osx" ] && [ -z ${CHOST+x} ]; then
-    # ccache not available on osx, see:

.travis/build-deps.sh build_openssl () { · line 135

Quoted 10 lines

.travis/build-deps.sh +0 -7

-    # https://github.com/travis-ci/travis-ci/issues/5567
-    # also ccache not enabled for cross builds
-    mkdir -p "${HOME}/bin"
-    ln -s "$(which ccache)" "${HOME}/bin/${CC}"
-    PATH="${HOME}/bin:${PATH}"
-fi
-
 if [ ! -z ${CHOST+x} ]; then
       #
       # openvpn requires at least mingw-gcc-4.9, which is available at xenial repo

Makes sense, tests still pass, simplifies the build script.

Acked-by Steffan Karger <[email protected]...>

-Steffan

Antonio Quartulli

Acked-by on v3 1/1

2018-01-07 08:03 UTC #4 lore raw

In reply to Ilya Shipitsin

Hi,

Quoted 3 lines · Ilya Shipitsin

1-2 minutes speedup osx builds by using brew cache. Also, ccache was removed for a while (builds fail after travis-ci upgraded clang to version 5.0.0)

you missed the Signed-off-by line.
But other than that:

Acked-by Antonio Quartulli <[email protected]...>

Signature · 1 line

Antonio Quartulli

Gert Doering

2018-01-09 13:58 UTC #5 lore raw

In reply to Ilya Shipitsin

Your patch has been applied to the master branch.

commit 0c1b9864184e609b68c2bb317ee57317ae12a026

Author: Ilya Shipitsin
Date:   Fri Jan 5 00:37:10 2018 +0500

     travis-ci: add brew cache, remove ccache

     Acked-by: Steffan Karger <[email protected]...>
     Message-Id: <[email protected]...>
     URL: https://www.mail-archive.com/[email protected]/msg16154.html
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering