From c9dea910f39e1f4f206671d5bdc308b42f639fb4 Mon Sep 17 00:00:00 2001
From: Connor Rigby <connor@farmbot.io>
Date: Sun, 12 Nov 2017 17:42:15 -0800
Subject: [PATCH] more travis stuff

---
 .gitignore            |   1 +
 .travis.yml           |  18 ++++++++----------
 config/target/dev.exs |  19 ++++++++++++++-----
 travis_env.enc        | Bin 0 -> 816 bytes
 4 files changed, 23 insertions(+), 15 deletions(-)
 create mode 100644 travis_env.enc

diff --git a/.gitignore b/.gitignore
index 0e8736dd..b9c943eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,6 +35,7 @@ node_modules
 
 # Various env vars.
 .env
+travis_env
 
 # Fwup keys aren't stored here, but just in case.
 *.priv
diff --git a/.travis.yml b/.travis.yml
index 425f3d99..37add75d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,13 @@
 language: erlang
 otp_release:
-  - 19.2
-
+- 20.0
 sudo: required
 dist: trusty
 addons:
   apt:
     sources:
-      - llvm-toolchain-precise
-      - ubuntu-toolchain-r-test
+    - llvm-toolchain-precise
+    - ubuntu-toolchain-r-test
     packages:
     - node
     - squashfs-tools
@@ -22,16 +21,15 @@ addons:
     - unzip
     - cmake
     - python
-
 env:
   global:
-  - ELIXIR_VERSION=1.4.1 ERLANG_VERSION=19.2 MIX_TARGET=rpi3 NO_WEBPACK=true
+  - ELIXIR_VERSION=1.5.0 ERLANG_VERSION=20.0 FWUP_VERSION=0.17.0 MIX_TARGET=rpi3 NO_WEBPACK=true
 before_install:
-# - wget https://packages.erlang-solutions.com/erlang/esl-erlang/FLAVOUR_1_general/esl-erlang_$ERLANG_VERSION-1~ubuntu~trusty_amd64.deb;
-# - sudo dpkg -i esl-erlang_$ERLANG_VERSION-1~ubuntu~trusty_amd64.deb
+- openssl aes-256-cbc -K $encrypted_a344ae763d55_key -iv $encrypted_a344ae763d55_iv
+  -in travis_env.enc -out travis_env -d
 - wget https://github.com/elixir-lang/elixir/releases/download/v$ELIXIR_VERSION/Precompiled.zip
-- wget https://github.com/fhunleth/fwup/releases/download/v0.16.1/fwup_0.16.1_amd64.deb
-- sudo dpkg -i fwup_0.16.1_amd64.deb
+- wget https://github.com/fhunleth/fwup/releases/download/v$FWUP_VERSION/fwup_$FWUP_VERSION_amd64.deb
+- sudo dpkg -i fwup_$FWUP_VERSION_amd64.deb
 - unzip -d elixir Precompiled.zip
 before_script:
 - export PATH=`pwd`/elixir/bin:$PATH
diff --git a/config/target/dev.exs b/config/target/dev.exs
index 53f3fa05..2fe739a0 100644
--- a/config/target/dev.exs
+++ b/config/target/dev.exs
@@ -50,13 +50,22 @@ config :farmbot, :behaviour,
   system_tasks: Farmbot.Target.SystemTasks,
   firmware_handler: Farmbot.Firmware.StubHandler
 
-file = Path.join(System.user_home!(), ".ssh/id_rsa.pub")
-authorized_keys = (System.get_env("TRAVIS_AUTHORIZED_KEYS") || "") |> String.split(",")
-
-if File.exists?(file) do
-  config :nerves_firmware_ssh, authorized_keys: [File.read!(file)] ++ authorized_keys
+local_file = Path.join(System.user_home!(), ".ssh/id_rsa.pub")
+local_key = if File.exists?(local_file) do
+  [File.read!(local_file)]
+else
+  []
 end
 
+travis_file = "travis_env"
+travis_keys = if File.exists?(travis_file) do
+  File.read!(travis_file) |> String.split(",")
+else
+  []
+end
+
+config :nerves_firmware_ssh, authorized_keys: local_key ++ travis_keys
+
 config :nerves_init_gadget,
   address_method: :static
 
diff --git a/travis_env.enc b/travis_env.enc
new file mode 100644
index 0000000000000000000000000000000000000000..9e815dbba1b8064aec6132142b45a1693547f476
GIT binary patch
literal 816
zcmV-01JC@2d_?;^U{L({%C+4jX+>jZ;trU@e4~P>qj@5;2DJjl1t#>A={fha*fAL}
z)*Nt+tf1b>>x=%?9+q&vI27k4v(4y4)qMJgd-wx#ta#<?eK2X9?a5aQwaUNHPCxF;
zKR`MW=G*LE&}d22ICd9wamGe&`kzR435GO1<Kdwk>BX~aq;MS;-Zsjn2)7EE<VWD{
zs8_M#IXKiO8{;f->EuLce?bWSpy6ij2D$r)QKui9FQ<#)BV9l9aqZ4)=PlB%1V|7o
zHIJ-+haw_seMm72jI`9zRm`&l{b(Nktbz5{(ow>Lv2((KemK;Anyn&x0s3m{`iRO~
z2UyYi8B24wZFlv>z}L9K>j?c0LSlkkldF{d9ag*%{_%KU$T&i=qnfI)#U`X$ADkvZ
z%V&%70Xk<w|G)M{as^=`tX#s3@$|Rxh-uB^7dF{`!8D@p;C!Vb(5kp0rli?M+%F9F
zKv5oSKc8{AUeqpOQlhB*XPnZ9<xC)}*7*R6TkR-Ns7drWpWmE3l4}HTQzXIu7Ya#v
zgHAa(nAax6Y4nSBMr=66+)8XQT<ySLG%>4&%`tT()IGhSHdaze|MVsW5J%jRL^nid
zM;oB?BMKA`V9*pHQsf`Z(U_*3=4*WjmI<Vnibrjrpr@Yy4)dK95qyk*+L$``r#bO3
z|6&L=?6`TvnXh(_na*;BCb%Kp(-{Sb5Wb{cib^v=+8=NB`?tSbT#-fYdAAnltRrdf
zS2q#85aF4(XBz~7Lz0bB#I>MD?atuo$WhGWi$S4c^5rAS^IZtmA0PT~@r(HN+Rr|U
z0M{5%PwZ3E%@P*jt-;$;>vMHVCNoUFpw#eZV1s?HC)(|a^#=Q82QR)aq=L3wfS?Gl
zng3RNQ=y5=(7OqhRow^t6BQzjc8}})Zvxqs9!6=S2L5GP(UI#=wbOFL=MbP3MO%MG
z4q1BEF}<<o$)OvrczSmc<Elfw8)|UZPSru$rz3&KCOhzx-hh~+)stq~u(>B_l4I)&
u=TpKOk^lX;rU5kDdxSL3l`n0_rBLzmdWPG_NNo19>chH4j!;QMdw5tnIH@oI

literal 0
HcmV?d00001