From 0a20307c393e17d64aa5b7d40aacc07afcb4f558 Mon Sep 17 00:00:00 2001 From: Peter Colberg Date: Thu, 29 Oct 2015 20:07:35 -0400 Subject: Set URLCACHE to JuliaLang cache server for Travis builds Download Unicode data from upstream server by default. Download GNU Unifont from reliable GNU mirror by default. --- .travis.yml | 4 ++++ data/Makefile | 8 ++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3199bbb..19eb6eb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,3 +15,7 @@ script: - make data && diff data/utf8proc_data.c.new utf8proc_data.c - (mkdir build_static && cd build_static && cmake .. -DCMAKE_VERBOSE_MAKEFILE=ON && make) - (mkdir build_shared && cd build_shared && cmake .. -DCMAKE_VERBOSE_MAKEFILE=ON -DBUILD_SHARED_LIBS=ON && make) +env: + # use JuliaLang caching (https://github.com/staticfloat/cache.julialang.org) + # so that Travis builds do not depend on anyone's flaky servers but our own + - URLCACHE=https://cache.e.ip.saba.us/ diff --git a/data/Makefile b/data/Makefile index 31e3934..37bdd74 100644 --- a/data/Makefile +++ b/data/Makefile @@ -12,10 +12,6 @@ JULIA=julia FONTFORGE=fontforge CURLFLAGS = --retry 5 --location -# use JuliaLang caching (https://github.com/staticfloat/cache.julialang.org) -# so that Travis builds do not depend on anyone's flaky servers but our own -URLCACHE=https://cache.e.ip.saba.us/ - .PHONY: clean .DELETE_ON_ERROR: @@ -27,10 +23,10 @@ utf8proc_data.c.new: data_generator.rb UnicodeData.txt GraphemeBreakProperty.txt UNIFONT_VERSION=8.0.01 unifont.ttf: - $(CURL) $(CURLFLAGS) -o $@ $(URLCACHE)http://unifoundry.com/pub/unifont-$(UNIFONT_VERSION)/font-builds/unifont-$(UNIFONT_VERSION).ttf + $(CURL) $(CURLFLAGS) -o $@ $(URLCACHE)https://mirrors.kernel.org/gnu/unifont/unifont-$(UNIFONT_VERSION)/unifont-$(UNIFONT_VERSION).ttf unifont_upper.ttf: - $(CURL) $(CURLFLAGS) -o $@ $(URLCACHE)http://unifoundry.com/pub/unifont-$(UNIFONT_VERSION)/font-builds/unifont_upper-$(UNIFONT_VERSION).ttf + $(CURL) $(CURLFLAGS) -o $@ $(URLCACHE)https://mirrors.kernel.org/gnu/unifont/unifont-$(UNIFONT_VERSION)/unifont_upper-$(UNIFONT_VERSION).ttf %.sfd: %.ttf $(FONTFORGE) -lang=ff -c "Open(\"$<\");Save(\"$@\");Quit(0);" -- cgit v1.2.3