[前][次][番号順一覧][スレッド一覧]

ruby-changes:58278

From: Takashi <ko1@a...>
Date: Thu, 17 Oct 2019 00:29:40 +0900 (JST)
Subject: [ruby-changes:58278] 5c80dffd05 (master): Revert "Disable ccache on arm64 build"

https://git.ruby-lang.org/ruby.git/commit/?id=5c80dffd05

From 5c80dffd0555a36a31f0da51696609a6af5e34ea Mon Sep 17 00:00:00 2001
From: Takashi Kokubun <takashikkbn@g...>
Date: Wed, 16 Oct 2019 08:28:53 -0700
Subject: Revert "Disable ccache on arm64 build"

This reverts commit e8124729fbeaf159ae615f61980ee10018ed5134.

It worked once, but soon after that it stopped working again
https://travis-ci.org/ruby/ruby/jobs/598491972

diff --git a/.travis.yml b/.travis.yml
index b20feff..b9a6413 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -73,6 +73,7 @@ env: https://github.com/ruby/ruby/blob/trunk/.travis.yml#L73
       - |-
         ${BEFORE_INSTALL}
         tool/travis_retry.sh sudo -E apt-get $travis_apt_get_options install \
+          ccache \
           gcc-8 \
           g++-8 \
           libffi-dev \
@@ -126,12 +127,6 @@ env: https://github.com/ruby/ruby/blob/trunk/.travis.yml#L127
     name: arm64-linux
     arch: arm64
     <<: *gcc-8
-    # arm64 build always fails with cache
-    cache:
-      ccache: false
-      directories: []
-    env:
-      - DISABLE_CCACHE=true
 
   - &jemalloc
     name: --with-jemalloc
@@ -430,14 +425,12 @@ before_script: https://github.com/ruby/ruby/blob/trunk/.travis.yml#L425
   - chmod -R a-w .
   - chmod -R u+w build config_1st config_2nd
   - cd build
+  - ccache --show-stats
   - |-
-    if [ "$DISABLE_CCACHE" != true ]; then
-      ccache --show-stats
-      case "$CC" in
-      gcc*)   CC="ccache $CC${GCC_FLAGS:+ }$GCC_FLAGS -fno-diagnostics-color";;
-      clang*) CC="ccache $CC${GCC_FLAGS:+ }$GCC_FLAGS -fno-color-diagnostics";;
-      esac
-    fi
+    case "$CC" in
+    gcc*)   CC="ccache $CC${GCC_FLAGS:+ }$GCC_FLAGS -fno-diagnostics-color";;
+    clang*) CC="ccache $CC${GCC_FLAGS:+ }$GCC_FLAGS -fno-color-diagnostics";;
+    esac
   - |-
     [ ! -f config.cache ] ||
     [ "$CC" = "`sed -n s/^ac_cv_prog_CC=//p config.cache`" ] ||
@@ -465,8 +458,7 @@ before_script: https://github.com/ruby/ruby/blob/trunk/.travis.yml#L458
         exit 1
       fi
     fi
-  - |-
-    [ "$DISABLE_CCACHE" = true ] || ccache --show-stats
+  - ccache --show-stats
   - |-
     [ -z "${GEMS_FOR_TEST}" ] ||
     $RUBY_PREFIX/bin/gem install --no-document $GEMS_FOR_TEST
-- 
cgit v0.10.2


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]