Skip to content

Commit 921db0c

Browse files
update for nerves v0.9
1 parent 870d62a commit 921db0c

File tree

12 files changed

+84
-75
lines changed

12 files changed

+84
-75
lines changed

.circleci/config.yml

+12-8
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,16 @@ install_hex_rebar: &install_hex_rebar
1919
run:
2020
name: Install hex and rebar
2121
command: |
22+
cd /tmp
2223
mix local.hex --force
2324
mix local.rebar --force
2425
2526
install_nerves_bootstrap: &install_nerves_bootstrap
2627
run:
2728
name: Install nerves_bootstrap
28-
command: mix archive.install hex nerves_bootstrap --force
29+
command: |
30+
cd /tmp
31+
mix archive.install github nerves-project/nerves_bootstrap --force
2932
3033
version: 2.0
3134

@@ -47,11 +50,11 @@ jobs:
4750
command: mix compile
4851
- run:
4952
name: Lint
50-
command: mix nerves.system.lint nerves_defconfig
53+
command: mix nerves.system.lint nerves_defconfig
5154
- save_cache:
52-
key: nerves/cache-{{ .Environment.CIRCLE_PROJECT_USERNAME}}-{{ .Environment.CIRCLE_PROJECT_REPONAME}}
55+
key: nerves/dl-{{ .Environment.CIRCLE_PROJECT_USERNAME}}-{{ .Environment.CIRCLE_PROJECT_REPONAME}}
5356
paths:
54-
- "/nerves/cache"
57+
- "/nerves/dl"
5558
- run:
5659
name: "Create artifact dir"
5760
command: mkdir -p /nerves/deploy/system/artifacts
@@ -62,15 +65,13 @@ jobs:
6265
- run:
6366
name: "Create artifacts"
6467
command: |
65-
cd /nerves/build/.nerves/artifacts/*
66-
make system
6768
if [ -n "$CIRCLE_TAG" ]; then
6869
TAG=$CIRCLE_TAG
6970
else
7071
TAG=$CIRCLE_SHA1
7172
fi
72-
cp ${CIRCLE_PROJECT_REPONAME}.tar.gz /nerves/deploy/system/artifacts/${CIRCLE_PROJECT_REPONAME}-${TAG}.tar.gz
73-
cp images/${CIRCLE_PROJECT_REPONAME}.fw /nerves/deploy/system/artifacts/${CIRCLE_PROJECT_REPONAME}-${TAG}.fw
73+
mix nerves.artifact ${CIRCLE_PROJECT_REPONAME} --path /nerves/deploy/system/artifacts
74+
cp .nerves/artifacts/*/images/${CIRCLE_PROJECT_REPONAME}.fw /nerves/deploy/system/artifacts/${CIRCLE_PROJECT_REPONAME}-${TAG}.fw
7475
- store_artifacts:
7576
path: /nerves/deploy/system/artifacts
7677
destination: system
@@ -94,6 +95,9 @@ jobs:
9495
- <<: *install_elixir
9596
- <<: *install_hex_rebar
9697
- <<: *install_nerves_bootstrap
98+
- run:
99+
name: Create Nerves paths
100+
command: mkdir -p ~/.nerves/artifacts
97101
- run:
98102
name: Install test dependencies
99103
command: mix deps.get

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@
44
erl_crash.dump
55
*.ez
66
build.log
7+
archive.log
78
.nerves

CHANGELOG.md

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
# Changelog
22

3-
## v0.19.2-dev
3+
## v0.20.0
4+
5+
Updated dependencies
6+
* [nerves_system_br v0.17.0](https://github.com/nerves-project/nerves_system_br/releases/tag/v0.17.0)
7+
* [nerves_toolchain v0.13.0](https://github.com/nerves-project/toolchains/releases/tag/v0.13.0)
8+
* [nerves v0.9.0](https://github.com/nerves-project/nerves/releases/tag/v0.9.0)
49

510
## v0.19.1
611

VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.19.2-dev
1+
0.20.0

mix.exs

+8-6
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ defmodule NervesSystemRpi3.Mixfile do
1616
description: description(),
1717
package: package(),
1818
deps: deps(),
19-
aliases: ["deps.precompile": ["nerves.env", "deps.precompile"]]
19+
aliases: [
20+
"deps.precompile": ["nerves.env", "deps.precompile"],
21+
"deps.get": ["deps.get", "nerves.deps.get"]]
2022
]
2123
end
2224

@@ -27,8 +29,8 @@ defmodule NervesSystemRpi3.Mixfile do
2729
def nerves_package do
2830
[
2931
type: :system,
30-
artifact_url: [
31-
"https://github.com/nerves-project/#{@app}/releases/download/v#{@version}/#{@app}-v#{@version}.tar.gz"
32+
artifact_sites: [
33+
{:github_releases, "nerves-project/#{@app}"}
3234
],
3335
platform: Nerves.System.BR,
3436
platform_config: [
@@ -40,9 +42,9 @@ defmodule NervesSystemRpi3.Mixfile do
4042

4143
defp deps do
4244
[
43-
{:nerves, "~> 0.8", runtime: false},
44-
{:nerves_system_br, "0.16.4", runtime: false},
45-
{:nerves_toolchain_arm_unknown_linux_gnueabihf, "~> 0.12.1", runtime: false},
45+
{:nerves, "~> 0.9", runtime: false },
46+
{:nerves_system_br, "0.17.0", runtime: false},
47+
{:nerves_toolchain_arm_unknown_linux_gnueabihf, "~> 0.13.0", runtime: false},
4648
{:nerves_system_linter, "~> 0.2.2", runtime: false}
4749
]
4850
end

mix.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
%{
22
"distillery": {:hex, :distillery, "1.5.2", "eec18b2d37b55b0bcb670cf2bcf64228ed38ce8b046bb30a9b636a6f5a4c0080", [:mix], [], "hexpm"},
3-
"nerves": {:hex, :nerves, "0.8.3", "cd3db3adadf5d4191249770ff2f247884408722f1fef2fa1e24f3145972bcf6f", [:mix], [{:distillery, "~> 1.4", [hex: :distillery, repo: "hexpm", optional: false]}], "hexpm"},
4-
"nerves_system_br": {:hex, :nerves_system_br, "0.16.4", "070d88b5ef5b507b1604ac158051860cee3100501b05913ad181d9ea583f06d7", [:mix], [], "hexpm"},
3+
"nerves": {:hex, :nerves, "0.9.0", "41f95cb299565f0b759924430f62d1ae7399f4552d8dcbf83699103fda8fd5ad", [:mix], [{:distillery, "~> 1.4", [hex: :distillery, repo: "hexpm", optional: false]}], "hexpm"},
4+
"nerves_system_br": {:hex, :nerves_system_br, "0.17.0", "f7c0d1b6b11e9a1c187b17f2401a00956bebd5c45946bfe2a332ad26ecbf18f9", [:mix], [], "hexpm"},
55
"nerves_system_linter": {:hex, :nerves_system_linter, "0.2.3", "288a04f3d6dd08f97c839b5a5480c511f4c55bd193bc9dffe6f025de79108cea", [:mix], [], "hexpm"},
6-
"nerves_toolchain_arm_unknown_linux_gnueabihf": {:hex, :nerves_toolchain_arm_unknown_linux_gnueabihf, "0.12.1", "8a65f0123cfee1d229b32c03ce5ee87ce587e6dc0b2dda7de71f290b2fa24386", [:mix], [{:nerves, "~> 0.8", [hex: :nerves, repo: "hexpm", optional: false]}, {:nerves_toolchain_ctng, "~> 1.2", [hex: :nerves_toolchain_ctng, repo: "hexpm", optional: false]}], "hexpm"},
6+
"nerves_toolchain_arm_unknown_linux_gnueabihf": {:hex, :nerves_toolchain_arm_unknown_linux_gnueabihf, "0.13.0", "998a206d011351be34a95f63362c8195a4e81be81496206390258442166a8353", [:mix], [{:nerves, "~> 0.9", [hex: :nerves, repo: "hexpm", optional: false]}, {:nerves_toolchain_ctng, "~> 1.3", [hex: :nerves_toolchain_ctng, repo: "hexpm", optional: false]}], "hexpm"},
77
"nerves_toolchain_armv6_rpi_linux_gnueabi": {:hex, :nerves_toolchain_armv6_rpi_linux_gnueabi, "0.12.1", "b4960a83b27d682b902d72615f657e8326ff0d87c886244f5585e614332f5678", [], [{:nerves, "~> 0.8", [hex: :nerves, repo: "hexpm", optional: false]}, {:nerves_toolchain_ctng, "~> 1.2", [hex: :nerves_toolchain_ctng, repo: "hexpm", optional: false]}], "hexpm"},
8-
"nerves_toolchain_ctng": {:hex, :nerves_toolchain_ctng, "1.2.1", "78c7c6cbd086f6b5c0302ed4f1950a3eb9ae8a38d97a98d5266a67d53008b40d", [:mix], [], "hexpm"},
8+
"nerves_toolchain_ctng": {:hex, :nerves_toolchain_ctng, "1.3.0", "37486214f043e695b256785647f33e00b0ea4dcec2dfacd6e2c044c15d656e9d", [:mix], [{:nerves, "~> 0.9", [hex: :nerves, repo: "hexpm", optional: false]}], "hexpm"},
99
}

nerves_defconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ BR2_GLOBAL_PATCH_DIR="${BR2_EXTERNAL_NERVES_PATH}/patches"
55
BR2_TOOLCHAIN_EXTERNAL=y
66
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
77
BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
8-
BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/nerves-project/toolchains/releases/download/v0.12.1/nerves_toolchain_arm_unknown_linux_gnueabihf-0.12.1.linux-x86_64.tar.xz"
8+
BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/nerves-project/toolchains/releases/download/v0.13.0/nerves_toolchain_arm_unknown_linux_gnueabihf-linux_x86_64-0.13.0-D25664C99BC7E3023A2C093C726649E7D50333B9F3887738634F124C9B5BA173.tar.xz"
99
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="arm-unknown-linux-gnueabihf"
1010
BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
1111
BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_1=y

rootfs_overlay/etc/erlinit.config

+4-4
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
# Mount the application partition (run "man fstab" for field names)
3939
# NOTE: This must match the location in the fwup.conf. If it doesn't the system
4040
# will probably still work fine, but you won't get shell history since
41-
# bootloader/nerves_runtime can't mount the application filesystem before
41+
# shoehorn/nerves_runtime can't mount the application filesystem before
4242
# the history is loaded. If this mount fails due to corruption, etc.,
4343
# nerves_runtime will auto-format it. Your applications will need to handle
4444
# initializing any expected files and folders.
@@ -52,7 +52,7 @@
5252
-d "/usr/bin/boardid -b rpi -n 4"
5353
-n nerves-%.4s
5454

55-
# If using bootloader (https://github.com/nerves-project/bootloader), start the
56-
# bootloader OTP release up first. If bootloader isn't around, erlinit fails back
55+
# If using shoehorn (https://github.com/nerves-project/shoehorn), start the
56+
# shoehorn OTP release up first. If shoehorn isn't around, erlinit fails back
5757
# to the main OTP release.
58-
--boot bootloader
58+
--boot shoehorn

test/config/config.exs

+25-23
Original file line numberDiff line numberDiff line change
@@ -19,26 +19,29 @@ websocket_protocol = System.get_env("WEBSOCKET_PROTOCOL") || "ws"
1919

2020
# Common configuration
2121

22-
# Configure bootloader boot order.
23-
config(:bootloader, app: :nerves_system_test, init: [:nerves_runtime, :nerves_network])
22+
# Configure shoehorn boot order.
23+
config :shoehorn,
24+
app: :nerves_system_test,
25+
init: [:nerves_runtime, :system_registry_term_storage, :nerves_network]
2426

2527
# Only trust signed firmware
26-
config(:nerves_system_test, :firmware, public_key: System.get_env("NERVES_FW_PUB_KEY"))
28+
config :nerves_system_test, :firmware,
29+
public_key: System.get_env("NERVES_FW_PUB_KEY")
2730

2831
# Configure system_registry term storage to store the wifi credentials on the
2932
# app data partition. If the device is using eth0 as the primary connection
3033
# mechanism the wlan0 settings do not need to be configured.
31-
config(:system_registry, SystemRegistry.TermStorage, path: "/root/system_registry", scopes: [
32-
[:config, :network_interface, "wlan0", :ssid],
33-
[:config, :network_interface, "wlan0", :psk]
34-
])
34+
config :system_registry, SystemRegistry.TermStorage,
35+
path: "/root/system_registry",
36+
scopes: [
37+
[:config, :network_interface, "wlan0", :ssid],
38+
[:config, :network_interface, "wlan0", :psk]
39+
]
3540

3641
# Configure the default interface settings.
3742
# wlan0 | eth0 - Used to establish a connection to the test server.
3843
# usb0 - configured with linklocal to be validated as part of the test results.
39-
config(
40-
:nerves_network,
41-
:default,
44+
config :nerves_network, :default,
4245
eth0: [
4346
ipv4_address_method: :dhcp
4447
],
@@ -48,14 +51,11 @@ config(
4851
usb0: [
4952
ipv4_address_method: :linklocal
5053
]
51-
)
5254

5355
# Configure the url for the connection to the test server phoenix channel socket.
54-
config(
55-
:nerves_system_test,
56-
NervesTestServer.Socket,
56+
config :nerves_system_test, NervesTestServer.Socket,
5757
url: "#{websocket_protocol}://#{test_server}/socket/websocket"
58-
)
58+
5959

6060
# Configure the test suite. nerves_system_test needs to know information such as
6161
# system - the name of the system repo the tests are being executed on
@@ -66,16 +66,18 @@ config(
6666
# of the app and dependencies. The default layout runs tests that are common
6767
# across devices (:nerves_system_test) and those that are specific to the
6868
# device (this app)
69-
config(:nerves_system_test, system: system, network_interface: network_interface, tests: [
70-
{:test, :priv_dir, "test"},
71-
{:nerves_system_test, :priv_dir, "test"}
72-
])
69+
config :nerves_system_test,
70+
system: system,
71+
network_interface:
72+
network_interface,
73+
tests: [
74+
{:test, :priv_dir, "test"},
75+
{:nerves_system_test, :priv_dir, "test"}
76+
]
7377

7478
# The configuration stored here is duplicated from the project so it can be
7579
# validated by nerves_system_test because the source is unavailable at runtime.
76-
config(
77-
:nerves_runtime,
78-
:kv,
80+
config :nerves_runtime, :kv,
7981
nerves_fw_application_part0_devpath: app_part_devparth,
8082
nerves_fw_application_part0_fstype: "ext4",
8183
nerves_fw_application_part0_target: "/root",
@@ -86,4 +88,4 @@ config(
8688
nerves_fw_product: Mix.Project.config()[:app],
8789
nerves_fw_vcs_identifier: System.get_env("NERVES_FW_VCS_IDENTIFIER"),
8890
nerves_fw_version: Mix.Project.config()[:version]
89-
)
91+

test/mix.exs

+2-11
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ defmodule Test.Mixfile do
1515
app: :test,
1616
version: "0.1.0",
1717
elixir: "~> 1.4",
18-
archives: [nerves_bootstrap: "~> 0.6"],
18+
archives: [nerves_bootstrap: "~> 0.7"],
1919
build_embedded: Mix.env() == :prod,
2020
start_permanent: Mix.env() == :prod,
21-
aliases: aliases(),
21+
aliases: Nerves.Bootstrap.add_aliases([]),
2222
deps: deps()
2323
]
2424
end
@@ -39,17 +39,8 @@ defmodule Test.Mixfile do
3939
# Type "mix help deps" for more examples and options
4040
def deps do
4141
[
42-
{:nerves, "~> 0.7", runtime: false},
4342
{:nerves_system_rpi3, path: "../", runtime: false},
4443
{:nerves_system_test, github: "nerves-project/nerves_system_test"}
45-
# {:nerves_system_test, path: "../../nerves_system_test"}
46-
]
47-
end
48-
49-
def aliases() do
50-
[
51-
"deps.precompile": ["nerves.precompile", "deps.precompile"],
52-
"deps.loadpaths": ["deps.loadpaths", "nerves.loadpaths"]
5344
]
5445
end
5546
end

test/mix.lock

+8-6
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,22 @@
22
"bootloader": {:hex, :bootloader, "0.1.3", "7770e9953ae0f161e2fd26e9ddb7b50e81b97f61db92c633e7ed90f028abcd61", [:mix], [{:distillery, "~> 1.0", [hex: :distillery, repo: "hexpm", optional: false]}], "hexpm"},
33
"distillery": {:hex, :distillery, "1.5.2", "eec18b2d37b55b0bcb670cf2bcf64228ed38ce8b046bb30a9b636a6f5a4c0080", [:mix], [], "hexpm"},
44
"elixir_make": {:hex, :elixir_make, "0.4.0", "992f38fabe705bb45821a728f20914c554b276838433349d4f2341f7a687cddf", [:mix], [], "hexpm"},
5-
"nerves": {:hex, :nerves, "0.8.3", "cd3db3adadf5d4191249770ff2f247884408722f1fef2fa1e24f3145972bcf6f", [:mix], [{:distillery, "~> 1.4", [hex: :distillery, repo: "hexpm", optional: false]}], "hexpm"},
5+
"nerves": {:hex, :nerves, "0.9.0", "41f95cb299565f0b759924430f62d1ae7399f4552d8dcbf83699103fda8fd5ad", [:mix], [{:distillery, "~> 1.4", [hex: :distillery, repo: "hexpm", optional: false]}], "hexpm"},
66
"nerves_network": {:hex, :nerves_network, "0.3.6", "c95779283ace071e9d12882d6a80e31edc8c476012adc61aba2ff6c306ef97b3", [:make, :mix], [{:elixir_make, "~> 0.4", [hex: :elixir_make, repo: "hexpm", optional: false]}, {:nerves_network_interface, "~> 0.4.0", [hex: :nerves_network_interface, repo: "hexpm", optional: false]}, {:nerves_wpa_supplicant, "~> 0.3.0", [hex: :nerves_wpa_supplicant, repo: "hexpm", optional: false]}, {:system_registry, "~> 0.4", [hex: :system_registry, repo: "hexpm", optional: false]}], "hexpm"},
77
"nerves_network_interface": {:hex, :nerves_network_interface, "0.4.4", "200b1a84bc1a7fdeaf3a1e0e2d4e9b33e240b034e73f39372768d43f8690bae0", [:make, :mix], [{:elixir_make, "~> 0.4", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm"},
88
"nerves_runtime": {:hex, :nerves_runtime, "0.5.3", "7447a3e718762f3901046f72cc824e528f8d0565a581b8ae58f4f5b6436bca7f", [:make, :mix], [{:elixir_make, "~> 0.4", [hex: :elixir_make, repo: "hexpm", optional: false]}, {:system_registry, "~> 0.5", [hex: :system_registry, repo: "hexpm", optional: false]}], "hexpm"},
9-
"nerves_system_br": {:hex, :nerves_system_br, "0.16.4", "070d88b5ef5b507b1604ac158051860cee3100501b05913ad181d9ea583f06d7", [:mix], [], "hexpm"},
9+
"nerves_system_br": {:hex, :nerves_system_br, "0.17.0", "f7c0d1b6b11e9a1c187b17f2401a00956bebd5c45946bfe2a332ad26ecbf18f9", [:mix], [], "hexpm"},
1010
"nerves_system_linter": {:hex, :nerves_system_linter, "0.2.3", "288a04f3d6dd08f97c839b5a5480c511f4c55bd193bc9dffe6f025de79108cea", [:mix], [], "hexpm"},
11-
"nerves_system_test": {:git, "https://github.com/nerves-project/nerves_system_test.git", "400261b7c1e0953fcce30daa6fe359c570b64e8e", []},
12-
"nerves_toolchain_arm_unknown_linux_gnueabihf": {:hex, :nerves_toolchain_arm_unknown_linux_gnueabihf, "0.12.1", "8a65f0123cfee1d229b32c03ce5ee87ce587e6dc0b2dda7de71f290b2fa24386", [:mix], [{:nerves, "~> 0.8", [hex: :nerves, repo: "hexpm", optional: false]}, {:nerves_toolchain_ctng, "~> 1.2", [hex: :nerves_toolchain_ctng, repo: "hexpm", optional: false]}], "hexpm"},
11+
"nerves_system_test": {:git, "https://github.com/nerves-project/nerves_system_test.git", "e2c1b8efb0eb2ae5ed80d48dd3f11fcb1022a68a", []},
12+
"nerves_toolchain_arm_unknown_linux_gnueabihf": {:hex, :nerves_toolchain_arm_unknown_linux_gnueabihf, "0.13.0", "998a206d011351be34a95f63362c8195a4e81be81496206390258442166a8353", [:mix], [{:nerves, "~> 0.9", [hex: :nerves, repo: "hexpm", optional: false]}, {:nerves_toolchain_ctng, "~> 1.3", [hex: :nerves_toolchain_ctng, repo: "hexpm", optional: false]}], "hexpm"},
1313
"nerves_toolchain_armv6_rpi_linux_gnueabi": {:hex, :nerves_toolchain_armv6_rpi_linux_gnueabi, "0.11.0", "74ee72f15baffe773e41bae1baeef3942fc8f97fa47d9d1bf9db07c17eca90bd", [:mix], [{:nerves, "~> 0.7", [hex: :nerves, repo: "hexpm", optional: false]}, {:nerves_toolchain_ctng, "~> 1.1", [hex: :nerves_toolchain_ctng, repo: "hexpm", optional: false]}], "hexpm"},
14-
"nerves_toolchain_ctng": {:hex, :nerves_toolchain_ctng, "1.2.1", "78c7c6cbd086f6b5c0302ed4f1950a3eb9ae8a38d97a98d5266a67d53008b40d", [:mix], [], "hexpm"},
14+
"nerves_toolchain_ctng": {:hex, :nerves_toolchain_ctng, "1.3.0", "37486214f043e695b256785647f33e00b0ea4dcec2dfacd6e2c044c15d656e9d", [:mix], [{:nerves, "~> 0.9", [hex: :nerves, repo: "hexpm", optional: false]}], "hexpm"},
1515
"nerves_watchdog": {:git, "https://github.com/mobileoverlord/nerves_watchdog.git", "660f5de7d075ad41c5a0a0dcade073712087b4e7", []},
1616
"nerves_wpa_supplicant": {:hex, :nerves_wpa_supplicant, "0.3.2", "19dc7e1248336e7f542b11b2b857ceb5b088d3eb41a6ca75b7b76628dcf67aad", [:make, :mix], [{:elixir_make, "~> 0.3", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm"},
1717
"phoenix_gen_socket_client": {:hex, :phoenix_gen_socket_client, "1.1.1", "d1fbe7f053a0e91eb4f6fa527c1c8a365da1a07b1d5c2993626cc899d98b36d2", [:mix], [], "hexpm"},
1818
"poison": {:hex, :poison, "2.2.0", "4763b69a8a77bd77d26f477d196428b741261a761257ff1cf92753a0d4d24a63", [:mix], [], "hexpm"},
19-
"system_registry": {:hex, :system_registry, "0.6.0", "31642177e6002d3cff2ada3553ed4e9c0a6ca015797d62d7d17c0ab8696185fc", [:mix], [], "hexpm"},
19+
"shoehorn": {:hex, :shoehorn, "0.2.0", "6aa80804145c545c59af01980d255209483b14826f53411b4a8797b24c323c20", [:mix], [{:distillery, "~> 1.0", [hex: :distillery, repo: "hexpm", optional: false]}], "hexpm"},
20+
"system_registry": {:hex, :system_registry, "0.7.0", "cd3aaf2c15392fa60f93869dde49f536fcf60e54f3b15db737e7d4ebcac108f4", [:mix], [], "hexpm"},
21+
"system_registry_term_storage": {:hex, :system_registry_term_storage, "0.1.0", "fdded792eb9b5428fa2804a50e25e7140056a48a3086b8efde77b97308236b22", [:mix], [{:system_registry, "~> 0.7", [hex: :system_registry, repo: "hexpm", optional: false]}], "hexpm"},
2022
"websocket_client": {:hex, :websocket_client, "1.2.4", "14ec1ca4b6d247b44ccd9a80af8f6ca98328070f6c1d52a5cb00bc9d939d63b8", [:rebar3], [], "hexpm"},
2123
}

test/rel/config.exs

+12-10
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# This sets the default release built by `mix release`
22
# This sets the default environment used by `mix release`
3-
use Mix.Releases.Config, default_release: :default, default_environment: :dev
3+
use Mix.Releases.Config,
4+
default_release: :default,
5+
default_environment: :dev
46

57
# For a full list of config options for both releases
68
# and environments, visit https://hexdocs.pm/distillery/configuration.html
@@ -11,11 +13,11 @@ use Mix.Releases.Config, default_release: :default, default_environment: :dev
1113
# and environment configuration is called a profile
1214

1315
environment :dev do
14-
set(cookie: :"eeW260*@lLKngEX.N;Ke>Lu:UWX{WHz_%Z($yrn=YYYU$UuB>2sftLYf!X[}/*Mo")
16+
set cookie: :"eeW260*@lLKngEX.N;Ke>Lu:UWX{WHz_%Z($yrn=YYYU$UuB>2sftLYf!X[}/*Mo"
1517
end
1618

1719
environment :prod do
18-
set(cookie: :"eeW260*@lLKngEX.N;Ke>Lu:UWX{WHz_%Z($yrn=YYYU$UuB>2sftLYf!X[}/*Mo")
20+
set cookie: :"eeW260*@lLKngEX.N;Ke>Lu:UWX{WHz_%Z($yrn=YYYU$UuB>2sftLYf!X[}/*Mo"
1921
end
2022

2123
# You may define one or more releases in this file.
@@ -24,14 +26,14 @@ end
2426
# will be used by default
2527

2628
release :test do
27-
set(version: current_version(:test))
28-
plugin(Bootloader.Plugin)
29+
set version: current_version(:test)
30+
plugin Shoehorn
2931

3032
if System.get_env("NERVES_SYSTEM") do
31-
set(dev_mode: false)
32-
set(include_src: false)
33-
set(include_erts: System.get_env("ERL_LIB_DIR"))
34-
set(include_system_libs: System.get_env("ERL_SYSTEM_LIB_DIR"))
35-
set(vm_args: "rel/vm.args")
33+
set dev_mode: false
34+
set include_src: false
35+
set include_erts: System.get_env("ERL_LIB_DIR")
36+
set include_system_libs: System.get_env("ERL_SYSTEM_LIB_DIR")
37+
set vm_args: "rel/vm.args"
3638
end
3739
end

0 commit comments

Comments
 (0)