From 3bbd52c67c60168ecdda459285829e8da664c1f7 Mon Sep 17 00:00:00 2001 From: connor rigby Date: Wed, 13 Dec 2017 11:38:49 -0800 Subject: [PATCH] Purge travis stuff --- .gitignore | 1 - .travis.yml | 54 ------------------------------------------ config/host/test.exs | 3 --- config/target/dev.exs | 9 +------ mix.exs | 2 +- travis_env.enc | Bin 816 -> 0 bytes 6 files changed, 2 insertions(+), 67 deletions(-) delete mode 100644 .travis.yml delete mode 100644 travis_env.enc diff --git a/.gitignore b/.gitignore index f478ffeb..560aff8b 100644 --- a/.gitignore +++ b/.gitignore @@ -35,7 +35,6 @@ node_modules # Various env vars. .env -travis_env scripts/mqtt.py # Fwup keys aren't stored here, but just in case. diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 26e484d0..00000000 --- a/.travis.yml +++ /dev/null @@ -1,54 +0,0 @@ -language: erlang -otp_release: -- 20.0 -sudo: required -dist: trusty -addons: - apt: - sources: - - llvm-toolchain-precise - - ubuntu-toolchain-r-test - packages: - - squashfs-tools - - libmnl-dev - - g++ - - libssl-dev - - libncurses5-dev - - bc - - m4 - - make - - unzip - - cmake - - python - - libudev-dev -env: - global: - - ELIXIR_VERSION=1.5.0 ERLANG_VERSION=20.0 FWUP_VERSION=0.17.0 MIX_ENV=test -before_install: -- 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.17.0/fwup_0.17.0_amd64.deb -- sudo dpkg -i fwup_0.17.0_amd64.deb -- unzip -d elixir Precompiled.zip -before_script: -- export PATH=`pwd`/elixir/bin:$PATH -script: -- sudo apt-get install -qq linux-headers-`uname -r` -- if [ "$CXX" = "g++" ]; then export CXX="g++-5" CC="gcc-5"; fi -- if [ "$CXX" = "clang++" ]; then export CXX="clang++-3.7" CC="clang-3.7"; fi -- mix local.hex --force -- mix local.rebar --force -- mix archive.install https://github.com/nerves-project/archives/raw/master/nerves_bootstrap.ez --force -- MIX_ENV=test mix deps.get -- mix credo --strict --ignore Credo.Check.Readability.MaxLineLength -- mix coveralls.travis --seed 0 --exclude farmbot_firmware -after_script: -- export MIX_ENV=dev -- export MIX_TARGET=rpi3 -- mix deps.get -- mix firmware -- mix firmware.slack --channels C58DCU4A3 $TRAVIS_COMMIT_MESSAGE; echo "done." -notifications: - slack: - secure: Y2jTU5Bs/TU0SQn4lMMdVohU57KfyBj2SEr9d+pNWXm1wcIecUrKrEo4fhNPrzsE7nWtrTQXroSWk1N7cioa9MO2WFbnuNEXJ3jm8uhFueCO9VGyGIxuTP7eISAduAVdjfWfVtYOf87vmiSe7yRn3XJtbGnCRB6EqyxKbnZzJJs= diff --git a/config/host/test.exs b/config/host/test.exs index 3c3735ae..f3798e23 100644 --- a/config/host/test.exs +++ b/config/host/test.exs @@ -1,9 +1,6 @@ use Mix.Config cond do - System.get_env("TRAVIS_COMMIT_MESSAGE") -> - Mix.shell.info [:green, "Using travis config."] - import_config("auth_secret_ci.exs") System.get_env("CIRCLECI") -> Mix.shell.info [:green, "Using circle ci config."] import_config("auth_secret_ci.exs") diff --git a/config/target/dev.exs b/config/target/dev.exs index 054a279c..6882b2c7 100644 --- a/config/target/dev.exs +++ b/config/target/dev.exs @@ -76,14 +76,7 @@ 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_firmware_ssh, authorized_keys: local_key config :bootloader, init: [:nerves_runtime, :nerves_init_gadget], diff --git a/mix.exs b/mix.exs index 137a72dd..0cac1d79 100644 --- a/mix.exs +++ b/mix.exs @@ -48,7 +48,7 @@ defmodule Farmbot.Mixfile do "coveralls.detail": :test, "coveralls.post": :test, "coveralls.html": :test, - "coveralls.travis": :test + "coveralls.circle": :test ], source_url: "https://github.com/Farmbot/farmbot_os", homepage_url: "http://farmbot.io", diff --git a/travis_env.enc b/travis_env.enc deleted file mode 100644 index 9e815dbba1b8064aec6132142b45a1693547f476..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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#BX~aq;MS;-Zsjn2)7EEEuLce?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&%70Xk4&%`tT()IGhSHdaze|MVsW5J%jRL^nid zM;oB?BMKA`V9*pHQsf`Z(U_*3=4*WjmIMD?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}<B_l4I)& u=TpKOk^lX;rU5kDdxSL3l`n0_rBLzmdWPG_NNo19>chH4j!;QMdw5tnIH@oI