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

ruby-changes:53866

From: shyouhei <ko1@a...>
Date: Thu, 29 Nov 2018 14:26:18 +0900 (JST)
Subject: [ruby-changes:53866] shyouhei:r66085 (trunk): .travis.yml: cache unicode.org files

shyouhei	2018-11-29 14:26:05 +0900 (Thu, 29 Nov 2018)

  New Revision: 66085

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=66085

  Log:
    .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.

  Modified files:
    trunk/.travis.yml
    trunk/common.mk
Index: common.mk
===================================================================
--- common.mk	(revision 66084)
+++ common.mk	(revision 66085)
@@ -1221,7 +1221,7 @@ update-mspec: https://github.com/ruby/ruby/blob/trunk/common.mk#L1221
 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 = \ https://github.com/ruby/ruby/blob/trunk/common.mk#L1313
 		$(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 = \
Index: .travis.yml
===================================================================
--- .travis.yml	(revision 66084)
+++ .travis.yml	(revision 66085)
@@ -61,6 +61,7 @@ cache: https://github.com/ruby/ruby/blob/trunk/.travis.yml#L61
   ccache: true
   directories:
     - $HOME/config_2nd
+    - $HOME/.downloaded-cache
 
 env:
   global:
@@ -319,11 +320,14 @@ before_script: https://github.com/ruby/ruby/blob/trunk/.travis.yml#L320
   - $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

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

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