From f09f11b3881f3c301b8afa615bfd84dc134ef9a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Aur=C3=A9lio=20da=20Silva?= Date: Tue, 13 Nov 2018 03:39:34 -0200 Subject: [PATCH] chore: fixing travis ci build failure due directory permissions [+] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit plus caching for revoked key hashes blacklist Signed-off-by: Marco Aurélio da Silva --- .gitignore | 1 + .travis.yml | 4 ++++ Makefile | 4 ++-- lib/blacklist.ml | 5 +++-- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 010b594..da4a198 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ docs/.bundle/config docs/_site/ docs/.jekyll-metadata dune-workspace +.hieroglyphs/ diff --git a/.travis.yml b/.travis.yml index 4a49ee5..53d3c44 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,3 +14,7 @@ env: os: - linux - osx + +cache: + directories: + - .hieroglyphs diff --git a/Makefile b/Makefile index 8e4adc4..f2d1690 100644 --- a/Makefile +++ b/Makefile @@ -31,10 +31,10 @@ doc: build # - ALCOTEST_SHOW_ERRORS=1 # test: - dune build @test/spec/runtest -f --no-buffer -j 1 + HIEROGLYPHS_ROOT=`pwd`/.hieroglyphs dune build @test/spec/runtest -f --no-buffer -j 1 bench: - dune build @test/bench/runtest -f --no-buffer -j 1 + HIEROGLYPHS_ROOT=`pwd`/.hieroglyphs dune build @test/bench/runtest -f --no-buffer -j 1 install: dune install diff --git a/lib/blacklist.ml b/lib/blacklist.ml index fad55e9..b2f47b3 100644 --- a/lib/blacklist.ml +++ b/lib/blacklist.ml @@ -12,8 +12,9 @@ let split address = let filename = String.sub ~pos:4 ~len:(length - 4) address in (directory, filename) -let _HOME = Sys.getenv_exn "HOME" -let _CONFIG_DIR = _HOME ^ "/.hieroglyphs" +let _CONFIG_DIR = match Sys.getenv "HIEROGLYPHS_ROOT" with + | None -> Sys.getenv_exn "HOME" ^ "/.hieroglyphs" + | Some directory -> directory let _BLACKLIST_ROOTDIR = _CONFIG_DIR ^ "/blacklist" let config = Irmin_git.config ~bare:true _BLACKLIST_ROOTDIR