diff --git a/.circleci/config.yml b/.circleci/config.yml index 9ee040a9f..52af783b7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -64,7 +64,7 @@ build_firmware_steps: &build_firmware_steps command: | echo $MIX_TARGET > MIX_TARGET echo $MIX_ENV > MIX_ENV - cp mix.lock.$MIX_TARGET MIX_LOCK + cp mix.lock MIX_LOCK - restore_cache: key: v8-fbos-{{ checksum "MIX_TARGET" }}-{{ checksum "MIX_ENV" }}-dependency-cache-{{ checksum "MIX_LOCK" }} - restore_cache: @@ -83,7 +83,7 @@ build_firmware_steps: &build_firmware_steps - run: name: Create artifacts command: | - cp _build/${MIX_TARGET}/${MIX_ENV}/nerves/images/farmbot.fw /nerves/deploy/system/artifacts/farmbot-${MIX_TARGET}-$(cat VERSION).fw + cp _build/${MIX_TARGET}_${MIX_ENV}/nerves/images/farmbot.fw /nerves/deploy/system/artifacts/farmbot-${MIX_TARGET}-$(cat VERSION).fw - save_cache: key: v8-fbos-{{ checksum "MIX_TARGET" }}-{{ checksum "MIX_ENV" }}-dependency-cache-{{ checksum "MIX_LOCK" }} paths: @@ -104,7 +104,7 @@ deploy_nerves_hub_firmware_steps: &deploy_nerves_hub_firmware_steps command: | echo $MIX_TARGET > MIX_TARGET echo $MIX_ENV > MIX_ENV - cp mix.lock.$MIX_TARGET MIX_LOCK + cp mix.lock MIX_LOCK - restore_cache: key: v8-fbos-{{ checksum "MIX_TARGET" }}-{{ checksum "MIX_ENV" }}-dependency-cache-{{ checksum "MIX_LOCK" }} - restore_cache: @@ -145,8 +145,8 @@ jobs: - save_cache: key: v8-fbos-host-test-dependency-cache-{{ checksum "mix.lock.host" }} paths: - - _build/host - - deps/host + - _build/host_test + - deps ################################################################################ # target=rpi app_env=prod # @@ -261,7 +261,7 @@ jobs: name: Setup ENV command: | echo rpi3 > MIX_TARGET_RPI3 - cp mix.lock.rpi3 MIX_LOCK_RPI3 + cp mix.lock MIX_LOCK_RPI3 # echo rpi > MIX_TARGET_RPI # cp mix.lock.rpi MIX_LOCK_RPI echo $MIX_ENV > MIX_ENV @@ -316,7 +316,7 @@ jobs: name: Setup ENV command: | echo rpi3 > MIX_TARGET_RPI3 - cp mix.lock.rpi3 MIX_LOCK_RPI3 + cp mix.lock MIX_LOCK_RPI3 # echo rpi > MIX_TARGET_RPI # cp mix.lock.rpi MIX_LOCK_RPI echo $MIX_ENV > MIX_ENV diff --git a/mix.lock b/mix.lock index 9d7ed900a..8db3c4f92 100644 --- a/mix.lock +++ b/mix.lock @@ -6,6 +6,7 @@ "bbmustache": {:hex, :bbmustache, "1.6.1", "9fb63fa60bd53afbf47f02e6d8bd6b2beafc068e02e20975254dc7461fd4f397", [:rebar3], [], "hexpm"}, "bunt": {:hex, :bunt, "0.2.0", "951c6e801e8b1d2cbe58ebbd3e616a869061ddadcc4863d0a2182541acae9a38", [:mix], [], "hexpm"}, "certifi": {:hex, :certifi, "2.5.1", "867ce347f7c7d78563450a18a6a28a8090331e77fa02380b4a21962a65d36ee5", [:rebar3], [{:parse_trans, "~>3.3", [hex: :parse_trans, repo: "hexpm", optional: false]}], "hexpm"}, + "circuits_gpio": {:hex, :circuits_gpio, "0.4.0", "f1ce5a50921b13f23847c47589b51bdd93afe372fabfb9a58497cad515a5cc98", [:make, :mix], [{:elixir_make, "~> 0.5", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm"}, "circuits_uart": {:hex, :circuits_uart, "1.3.1", "8c0a56f06828133a0b08363ecb994350a9529d388a912357d31829ae617cd801", [:mix], [{:elixir_make, "~> 0.4", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm"}, "combine": {:hex, :combine, "0.10.0", "eff8224eeb56498a2af13011d142c5e7997a80c8f5b97c499f84c841032e429f", [:mix], [], "hexpm"}, "connection": {:hex, :connection, "1.0.4", "a1cae72211f0eef17705aaededacac3eb30e6625b04a6117c1b2db6ace7d5976", [:mix], [], "hexpm"},