From a036e3686ef2a00958cfd33d2b83f4527b2c092f Mon Sep 17 00:00:00 2001 From: connor rigby Date: Thu, 28 Jun 2018 10:50:24 -0700 Subject: [PATCH] Bump versions to latest elixir/otp --- .circleci/config.yml | 4 ++-- .tool-versions | 4 ++-- CHANGELOG.md | 6 ++++-- mix.exs | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fc92aaf3..97cec5d1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,13 +1,13 @@ version: 2.0 defaults: &defaults docker: - - image: nervesproject/nerves:1.0.0-rc.0 + - image: nervesproject/nerves:1.3.0 install_elixir: &install_elixir run: name: Install Elixir command: | - wget https://github.com/elixir-lang/elixir/releases/download/v1.6.3/Precompiled.zip + wget https://github.com/elixir-lang/elixir/releases/download/v1.6.6/Precompiled.zip unzip -d /usr/local/elixir Precompiled.zip echo 'export PATH=/usr/local/elixir/bin:$PATH' >> $BASH_ENV diff --git a/.tool-versions b/.tool-versions index fc4ddda5..d5811f03 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,2 +1,2 @@ -erlang 20.2 -elixir 1.6.4 +erlang 20.3.1 +elixir 1.6.6 diff --git a/CHANGELOG.md b/CHANGELOG.md index d9ca42f3..e4aa99a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,9 @@ # Changelog # 6.4.4 -* Optimize AMQP connection -* Add new field on `informational_settings`: `soc_temp` +* Optimize AMQP connection. +* Add new field on `informational_settings`: `soc_temp`. +* Declare language and charset in Configurator to avoid localization issues. +* Update Linux system layer. # 6.4.3 * Fix Ramps firmware build. diff --git a/mix.exs b/mix.exs index 784cdeb0..888c5bd1 100644 --- a/mix.exs +++ b/mix.exs @@ -155,7 +155,7 @@ defmodule Farmbot.Mixfile do end defp system("rpi3"), - do: [{:nerves_system_farmbot_rpi3, "1.1.1-farmbot.0", runtime: false}] + do: [{:nerves_system_farmbot_rpi3, "1.2.1-farmbot.0", runtime: false}] defp system("rpi0"), do: [{:nerves_system_farmbot_rpi0, "1.0.0-rc.1-farmbot.0", runtime: false}]