Skip to content
This repository has been archived by the owner on Dec 3, 2019. It is now read-only.

Commit

Permalink
Bump version and docs
Browse files Browse the repository at this point in the history
  • Loading branch information
ConnorRigby committed Aug 30, 2018
1 parent 8d7be38 commit a7639b1
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 21 deletions.
34 changes: 34 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
version: 2.0
install_elixir: &install_elixir
run:
name: Install Elixir
command: |
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
jobs:
build:
docker:
- image: nervesproject/nerves_system_br:1.4.2
environment:
MIX_ENV: test
SUDO: true
SUDO_ASKPASS: ''
steps:
- checkout
- <<: *install_elixir
- restore_cache:
keys:
- v2-dependency-cache-{{ checksum "mix.lock" }}
- run: mix local.hex --force
- run: mix local.rebar --force
- run: mix deps.get
- run: mix deps.compile
- run: mix compile
- run: mix test
- save_cache:
key: v2-dependency-cache-{{ checksum "mix.lock" }}
paths:
- _build
- deps
9 changes: 0 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,6 @@ ifeq ($(ERTS_DIR),)
endif
endif

# If not cross-compiling, then run sudo by default
ifeq ($(origin CROSSCOMPILE), undefined)
SUDO_ASKPASS ?= /usr/bin/ssh-askpass
SUDO ?= sudo
else
# If cross-compiling, then permissions need to be set some build system-dependent way
SUDO ?= true
endif

DEFAULT_TARGETS ?= priv priv/dhcp_server.so

Expand All @@ -54,7 +46,6 @@ priv:

priv/dhcp_server.so: c_src/dhcp_server.o
$(CC) $^ $(ERL_LDFLAGS) $(LDFLAGS) -o $@
SUDO_ASKPASS=$(SUDO_ASKPASS) $(SUDO) -- sh -c 'chown root:root $@; chmod +s $@'

clean:
rm -f priv/dhcp_server.* c_src/*.o
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[![CircleCI](https://circleci.com/gh/FarmBot-Labs/dhcp_server.svg?style=svg)](https://circleci.com/gh/FarmBot-Labs/dhcp_server)
# DHCPServer

## Installation
Expand All @@ -6,7 +7,7 @@ The package can be installed by adding `dhcp_server` to your list of dependencie

```elixir
def deps do
[{:dhcp_server, "~> 0.4"}]
[{:dhcp_server, "~> 0.5"}]
end
```

Expand Down
8 changes: 4 additions & 4 deletions mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ defmodule DHCPServer.Mixfile do
def project do
[
app: :dhcp_server,
version: "0.4.0",
version: "0.5.0",
elixir: "~> 1.4",
compilers: [:elixir_make] ++ Mix.compilers,
package: package(),
Expand All @@ -26,8 +26,8 @@ defmodule DHCPServer.Mixfile do
def deps do
[
{:elixir_make, "~> 0.4", runtime: false},
{:ex_doc, "~> 0.14", only: :dev},
{:nerves_network, "~> 0.3", [optional: true]}
{:ex_doc, "~> 0.18.4", only: :dev},
{:nerves_network, "~> 0.3", optional: true}
]
end

Expand All @@ -42,7 +42,7 @@ defmodule DHCPServer.Mixfile do
files: ["lib", "mix.exs", "README*", "COPYING", "src", "c_src/*.[ch]", "Makefile"],
maintainers: ["Connor Rigby"],
licenses: ["GPLv2"],
links: %{"GitHub" => "https://github.com/nerves-project/dhcp_server"}
links: %{"GitHub" => "https://github.com/FarmBot-Labs/dhcp_server"}
]
end
end
14 changes: 7 additions & 7 deletions mix.lock
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
%{
"earmark": {:hex, :earmark, "1.2.3", "206eb2e2ac1a794aa5256f3982de7a76bf4579ff91cb28d0e17ea2c9491e46a4", [:mix], [], "hexpm"},
"elixir_make": {:hex, :elixir_make, "0.4.0", "992f38fabe705bb45821a728f20914c554b276838433349d4f2341f7a687cddf", [:mix], [], "hexpm"},
"ex_doc": {:hex, :ex_doc, "0.16.3", "cd2a4cfe5d26e37502d3ec776702c72efa1adfa24ed9ce723bb565f4c30bd31a", [:mix], [{:earmark, "~> 1.1", [hex: :earmark, repo: "hexpm", optional: false]}], "hexpm"},
"nerves_network": {:hex, :nerves_network, "0.3.4", "c50a36b8263cda2bee18f408287d0f4474f8367702d170864325abbd5d424e4d", [: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"},
"nerves_network_interface": {:hex, :nerves_network_interface, "0.4.2", "7a3663a07803f2f9f1e37146714d24ccec1e9349268586e4ed8c41f38641d837", [:make, :mix], [{:elixir_make, "~> 0.4", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm"},
"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"},
"system_registry": {:hex, :system_registry, "0.6.0", "31642177e6002d3cff2ada3553ed4e9c0a6ca015797d62d7d17c0ab8696185fc", [:mix], [], "hexpm"},
"earmark": {:hex, :earmark, "1.2.6", "b6da42b3831458d3ecc57314dff3051b080b9b2be88c2e5aa41cd642a5b044ed", [:mix], [], "hexpm"},
"elixir_make": {:hex, :elixir_make, "0.4.2", "332c649d08c18bc1ecc73b1befc68c647136de4f340b548844efc796405743bf", [:mix], [], "hexpm"},
"ex_doc": {:hex, :ex_doc, "0.18.4", "4406b8891cecf1352f49975c6d554e62e4341ceb41b9338949077b0d4a97b949", [:mix], [{:earmark, "~> 1.1", [hex: :earmark, repo: "hexpm", optional: false]}], "hexpm"},
"nerves_network": {:hex, :nerves_network, "0.3.7", "200767191b1ded5a61cddbacd3efdce92442cc055bdc37c20ca8c7cb1d964098", [:make, :mix], [{:elixir_make, "~> 0.4", [hex: :elixir_make, repo: "hexpm", optional: false]}, {:nerves_network_interface, "~> 0.4.4", [hex: :nerves_network_interface, repo: "hexpm", optional: false]}, {:nerves_wpa_supplicant, "~> 0.3", [hex: :nerves_wpa_supplicant, repo: "hexpm", optional: false]}, {:system_registry, "~> 0.7", [hex: :system_registry, repo: "hexpm", optional: false]}], "hexpm"},
"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"},
"nerves_wpa_supplicant": {:hex, :nerves_wpa_supplicant, "0.3.3", "91b8505c023e891561ac6c64b9955450aa67fb16b523b18db5eeb4b4bcf30dc7", [:make, :mix], [{:elixir_make, "~> 0.4", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm"},
"system_registry": {:hex, :system_registry, "0.8.0", "09240347628b001433d18279a2759ef7237ba7361239890d8c599cca9a2fbbc2", [:mix], [], "hexpm"},
}

0 comments on commit a7639b1

Please sign in to comment.