[Openvpn-devel,v3] travis-ci: add brew cache, remove ccache

Message ID 20180104193710.23778-1-chipitsine@gmail.com
State Accepted
Headers show
Series
  • [Openvpn-devel,v3] travis-ci: add brew cache, remove ccache
Related show

Commit Message

Илья Шипицин Jan. 4, 2018, 7:37 p.m.
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(-)

Comments

Antonio Quartulli Jan. 4, 2018, 10:23 p.m. | #1
On 05/01/18 03:37, Ilya Shipitsin wrote:
> 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,
Илья Шипицин Jan. 5, 2018, 1:42 a.m. | #2
2018-01-05 3:23 GMT+05:00 Antonio Quartulli <a@unstable.cc>:

>
>
> On 05/01/18 03:37, Ilya Shipitsin wrote:
> > 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?
>

yes


>
>
> Regards,
>
>
> --
> Antonio Quartulli
>
>
<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">2018-01-05 3:23 GMT+05:00 Antonio Quartulli <span dir="ltr">&lt;<a href="mailto:a@unstable.cc" target="_blank">a@unstable.cc</a>&gt;</span>:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span class=""><br>
<br>
On 05/01/18 03:37, Ilya Shipitsin wrote:<br>
&gt; 1-2 minutes speedup osx builds by using brew cache.<br>
&gt; Also, ccache was removed for a while (builds fail<br>
&gt; after travis-ci upgraded clang to version 5.0.0)<br>
&gt; ---<br>
&gt; v2: this is a &quot;v2&quot; of previously issued &quot;enable ccache for osx and mingw builds&quot;<br>
&gt; patch. I decided not to enable ccache for mingw builds as it does not<br>
&gt; speedup them<br>
&gt;<br>
&gt; v3: removed ccache at all, because it fails on clang-5.0.0<br>
<br>
</span>Does this patch make &quot;[PATCH] travis-ci: speedup osx build by enabling<br>
brew cache​&quot; obsolete?<br></blockquote><div><br></div><div>yes<br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
<br>
Regards,<br>
<span class="HOEnZb"><font color="#888888"><br>
<br>
--<br>
Antonio Quartulli<br>
<br>
</font></span></blockquote></div><br></div></div>
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
Steffan Karger Jan. 5, 2018, 10:24 p.m. | #3
Hi,

On 04-01-18 20:37, Ilya Shipitsin wrote:
> 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(-)
> 
> diff --git a/.travis.yml b/.travis.yml
> index 1f669b30..43217b59 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -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
> diff --git a/.travis/build-deps.sh b/.travis/build-deps.sh
> index e787abab..bc538853 100755
> --- a/.travis/build-deps.sh
> +++ b/.travis/build-deps.sh
> @@ -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
> 

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

Acked-by: Steffan Karger <steffan@karger.me>

-Steffan

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
Antonio Quartulli Jan. 7, 2018, 8:03 a.m. | #4
Hi,

On 05/01/18 03:37, Ilya Shipitsin wrote:
> 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 <a@unstable.cc>
Gert Doering Jan. 9, 2018, 1:58 p.m. | #5
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 <steffan.karger@fox-it.com>
     Message-Id: <20180104193710.23778-1-chipitsine@gmail.com>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg16154.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>


--
kind regards,

Gert Doering


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot

Patch

diff --git a/.travis.yml b/.travis.yml
index 1f669b30..43217b59 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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
diff --git a/.travis/build-deps.sh b/.travis/build-deps.sh
index e787abab..bc538853 100755
--- a/.travis/build-deps.sh
+++ b/.travis/build-deps.sh
@@ -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