summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-11-29 05:26:05 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-11-29 05:26:05 +0000
commit493955c69226c3d10d66cc1199e5f3e1213dd858 (patch)
treea16701021081ae983f120178b8a22ecd6f2e50fb
parent2be1cf45c1c1192078e5e18b802adedf9455774e (diff)
.travis.yml: cache unicode.org files
Before this changeset (since r58071) we did not download files from unicode.org but just touch some files. This is a kind of hack that people normally don't do at home. We are caching other files between builds now. Why not also save those files downloaded from elsewhere. This covers more realistic workload, I guess. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66085 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--.travis.yml10
-rw-r--r--common.mk4
2 files changed, 9 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index f430dee61e..f00efeb8c7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -61,6 +61,7 @@ cache:
ccache: true
directories:
- $HOME/config_2nd
+ - $HOME/.downloaded-cache
env:
global:
@@ -319,11 +320,14 @@ before_script:
- $SETARCH uname -r
- rm -fr .ext autom4te.cache
- echo $TERM
+ - |-
+ [ -d ~/.downloaded-cache ] ||
+ mkdir ~/.downloaded-cache
+ - ln -s ~/.downloaded-cache
- "> config.status"
- sed -f tool/prereq.status Makefile.in common.mk > Makefile
- - make update-config_files
- - make touch-unicode-files
- - make -s $JOBS srcs UNICODE_FILES=.
+ - make -s $JOBS update-download
+ - make -s $JOBS srcs
- rm config.status Makefile rbconfig.rb .rbconfig.time
- |-
if [ -d ~/config_2nd ]; then
diff --git a/common.mk b/common.mk
index 8758eb6ff3..eab8f9fd09 100644
--- a/common.mk
+++ b/common.mk
@@ -1221,7 +1221,7 @@ update-mspec:
update-rubyspec:
update-config_files: PHONY
- $(Q) $(BASERUBY) -C "$(srcdir)" tool/downloader.rb -d tool -e gnu \
+ $(Q) $(BASERUBY) -C "$(srcdir)" tool/downloader.rb -d tool --cache-dir=$(CACHE_DIR) -e gnu \
config.guess config.sub
update-gems: PHONY
@@ -1313,7 +1313,7 @@ UNICODE_EMOJI_FILES = \
$(UNICODE_SRC_EMOJI_DATA_DIR)/emoji-zwj-sequences.txt \
$(empty)
-update-unicode: $(UNICODE_FILES)
+update-unicode: $(UNICODE_FILES) $(UNICODE_PROPERTY_FILES)
CACHE_DIR = $(srcdir)/.downloaded-cache
UNICODE_DOWNLOAD = \