Skip to content

Commit 85b6da9

Browse files
committed
Try caching the downloads elsewhere
$HOME/Downloads did not get cached, .cache/matplotlib already is
1 parent d552816 commit 85b6da9

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.travis.yml

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ cache:
1515
directories:
1616
- $HOME/.ccache # https://github.com/travis-ci/travis-ci/issues/5853
1717
- $HOME/.cache/matplotlib
18-
- $HOME/Downloads
1918

2019
addons:
2120
artifacts:

ci/osx-deps

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/bin/bash
22

33
set -euo pipefail
4+
cache="$HOME"/.cache/matplotlib
45

56
fold_start() {
67
key=$1
@@ -23,7 +24,7 @@ cached_download() {
2324
file=$1
2425
url=$2
2526
shasum=$3
26-
path="$HOME/Downloads/$file"
27+
path="$cache/$file"
2728
if [[ ! -f "$path"
2829
|| "$(shasum -a 256 "$path" | awk '{print $1}')" != "$shasum" ]]
2930
then
@@ -35,7 +36,7 @@ fold_start Python "Install Python 3.8 from python.org"
3536
cached_download python-3.8.5-macosx10.9.pkg \
3637
https://www.python.org/ftp/python/3.8.5/python-3.8.5-macosx10.9.pkg \
3738
e27c5a510c10f830084fb9c60b9e9aa8719d92e4537a80e6b4252c02396f0d29
38-
sudo installer -package "$HOME"/Downloads/python-3.8.5-macosx10.9.pkg -target /
39+
sudo installer -package "$cache"/python-3.8.5-macosx10.9.pkg -target /
3940
sudo ln -s /usr/local/bin/python3 /usr/local/bin/python
4041
hash -r
4142
fold_end Python
@@ -44,7 +45,7 @@ fold_start ccache 'Install ccache (compile it ourselves)'
4445
cached_download ccache-3.7.11.tar.xz \
4546
https://github.com/ccache/ccache/releases/download/v3.7.11/ccache-3.7.11.tar.xz \
4647
8d450208099a4d202bd7df87caaec81baee20ce9dd62da91e9ea7b95a9072f68
47-
tar xf "$HOME"/Downloads/ccache-3.7.11.tar.xz
48+
tar xf "$cache"/ccache-3.7.11.tar.xz
4849
pushd ccache-3.7.11
4950
./configure --prefix=/usr/local
5051
make -j2
@@ -60,5 +61,5 @@ cached_download freetype-2.6.1.tar.gz \
6061
https://download.savannah.gnu.org/releases/freetype/freetype-2.6.1.tar.gz \
6162
0a3c7dfbda6da1e8fce29232e8e96d987ababbbf71ebc8c75659e4132c367014
6263
mkdir -p build
63-
tar -x -C build -f "$HOME"/Downloads/freetype-2.6.1.tar.gz
64+
tar -x -C build -f "$cache"/freetype-2.6.1.tar.gz
6465
fold_end freetype

0 commit comments

Comments
 (0)