File 0005-Try-to-fix-travis-errors.patch of Package elixir-hex

Overview Repositories Revisions Requests Users Attributes Meta

File 0005-Try-to-fix-travis-errors.patch of Package elixir-hex

From 964061d17b3274e679652043ff72db31cd39ba97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Meadows-J=C3=B6nsson?=
 <eric.meadows.jonsson@gmail.com>
Date: Fri, 10 Jun 2016 21:10:14 +0300
Subject: [PATCH] Try to fix travis errors

---
 .travis.yml             |  7 ++++---
 test/support/hex_web.ex | 15 ++++++++++++---
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b340fed..6eac7d1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,12 +17,12 @@ before_install:
   - export PATH=$(pwd)/elixir/bin:${PATH}
 
   - mkdir -p ${HEXWEB_MIX_HOME}
-  - PATH=$(pwd)/${HEXWEB_ELIXIR_PATH}/bin:$(pwd)/${HEXWEB_OTP_PATH}/bin:${PATH} MIX_HOME=$(pwd)/${HEXWEB_MIX_HOME} mix local.hex --force
+  - PATH=$(pwd)/${HEXWEB_ELIXIR_PATH}/bin:$(pwd)/${HEXWEB_OTP_PATH}/bin:${PATH} MIX_HOME=$(pwd)/${HEXWEB_MIX_HOME} MIX_ARCHIVES=$(pwd)/${HEXWEB_MIX_HOME} mix local.hex --force
   - mix local.hex --force
 before_script:
   - git clone https://github.com/hexpm/hex_web.git
-  - cd hex_web; PATH=$(pwd)/../${HEXWEB_ELIXIR_PATH}/bin:$(pwd)/../${HEXWEB_OTP_PATH}/bin:${PATH} MIX_HOME=$(pwd)/../${HEXWEB_MIX_HOME} MIX_ENV=hex ../${HEXWEB_ELIXIR_PATH}/bin/mix deps.get; cd ..
-  - cd hex_web; PATH=$(pwd)/../${HEXWEB_ELIXIR_PATH}/bin:$(pwd)/../${HEXWEB_OTP_PATH}/bin:${PATH} MIX_HOME=$(pwd)/../${HEXWEB_MIX_HOME} MIX_ENV=hex ../${HEXWEB_ELIXIR_PATH}/bin/mix compile; cd ..
+  - cd hex_web; PATH=$(pwd)/../${HEXWEB_ELIXIR_PATH}/bin:$(pwd)/../${HEXWEB_OTP_PATH}/bin:${PATH} MIX_HOME=$(pwd)/../${HEXWEB_MIX_HOME} MIX_ARCHIVES=$(pwd)/../${HEXWEB_MIX_HOME} MIX_ENV=hex ../${HEXWEB_ELIXIR_PATH}/bin/mix deps.get; cd ..
+  - cd hex_web; PATH=$(pwd)/../${HEXWEB_ELIXIR_PATH}/bin:$(pwd)/../${HEXWEB_OTP_PATH}/bin:${PATH} MIX_HOME=$(pwd)/../${HEXWEB_MIX_HOME} MIX_ARCHIVES=$(pwd)/../${HEXWEB_MIX_HOME} MIX_ENV=hex ../${HEXWEB_ELIXIR_PATH}/bin/mix compile; cd ..
   - mix deps.get
   - MIX_ENV=test mix deps.compile
 script:
@@ -36,6 +36,7 @@ env:
     - HEXWEB_ELIXIR_PATH=hexweb_elixir
     - HEXWEB_OTP_PATH=hexweb_otp
     - HEXWEB_MIX_HOME=hexweb_mix
+    - HEXWEB_MIX_ARCHIVES=hexweb_mix
   matrix:
     - ELIXIR=v1.0.5
     - ELIXIR=v1.1.1
diff --git a/test/support/hex_web.ex b/test/support/hex_web.ex
index becaf55..c30c91a 100644
--- a/test/support/hex_web.ex
+++ b/test/support/hex_web.ex
@@ -27,8 +27,10 @@ defmodule HexTest.HexWeb do
   end
 
   def start do
-    path = String.to_char_list(path())
-    hexweb_mix_home = String.to_char_list(hexweb_mix_home())
+    path                = String.to_char_list(path())
+    hexweb_mix_home     = String.to_char_list(hexweb_mix_home())
+    hexweb_mix_archives = String.to_char_list(hexweb_mix_archives())
+    
     key = Path.join(__DIR__, "../fixtures/test_priv.pem")
           |> File.read!
           |> String.to_char_list
@@ -36,6 +38,7 @@ defmodule HexTest.HexWeb do
     env = [
       {'MIX_ENV', 'hex'},
       {'MIX_HOME', hexweb_mix_home},
+      {'MIX_ARCHIVES', hexweb_mix_archives},
       {'PATH', path},
       {'HEX_SIGNING_KEY', key}
     ]
@@ -108,11 +111,17 @@ defmodule HexTest.HexWeb do
     |> Path.expand
   end
 
+  defp hexweb_mix_archives do
+    (System.get_env("HEXWEB_MIX_ARCHIVES") || Mix.Local.path_for(:archive))
+    |> Path.expand
+  end
+
   defp cmd(command, args) do
     env = [
       {"MIX_ENV", "hex"},
       {"PATH", path()},
-      {"MIX_HOME", hexweb_mix_home()}
+      {"MIX_HOME", hexweb_mix_home()},
+      {"MIX_ARCHIVES", hexweb_mix_archives()},
     ]
 
     opts = [
-- 
2.1.4

Places

File 0005-Try-to-fix-travis-errors.patch of Package elixir-hex

Places