Skip to content

Commit

Permalink
Spruce Springsteen
Browse files Browse the repository at this point in the history
  • Loading branch information
Callum Barratt committed Jun 20, 2016
1 parent 7130abe commit a58fb93
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 18 deletions.
7 changes: 3 additions & 4 deletions bin/circleci_build.sh → bin/circleci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@ set -e
# Check for asdf
if ! asdf | grep version; then
git clone https://github.com/HashNuke/asdf.git ~/.asdf;
# Add plugins for asdf
asdf plugin-add erlang https://github.com/HashNuke/asdf-erlang.git
asdf plugin-add elixir https://github.com/HashNuke/asdf-elixir.git
fi

# Add plugins for asdf
asdf plugin-add erlang https://github.com/HashNuke/asdf-erlang.git
asdf plugin-add elixir https://github.com/HashNuke/asdf-elixir.git

# Extract vars from elixir_buildpack.config
. elixir_buildpack.config

Expand Down
2 changes: 1 addition & 1 deletion circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dependencies:
- deps
- _build
pre:
- ./bin/circleci_build.sh
- ./bin/circleci.sh
- mix deps.compile
- mix compile
test:
Expand Down
18 changes: 6 additions & 12 deletions config/config.exs
Original file line number Diff line number Diff line change
@@ -1,29 +1,23 @@
# This file is responsible for configuring your application
# and its dependencies with the aid of the Mix.Config module.
#
# This configuration file is loaded before any dependency and
# is restricted to this project.
use Mix.Config

# Configures the endpoint
config :callum, ecto_repos: [Callum.Repo]

config :callum, Callum.Endpoint,
url: [host: "localhost"],
root: Path.dirname(__DIR__),
secret_key_base: "r0A2kfTFbhTZKsBxxZAqm7kElVHL7GqK9eDDqtAT3yXrdoIHwQNt2dGbMH+pPxrq",
render_errors: [accepts: ~w(html json)],
pubsub: [name: Callum.PubSub,
adapter: Phoenix.PubSub.PG2]
pubsub: [
name: Callum.PubSub,
adapter: Phoenix.PubSub.PG2
]

# Configures Elixir's Logger
config :logger, :console,
format: "$time $metadata[$level] $message\n",
metadata: [:request_id]

# Import environment specific config. This must remain at the bottom
# of this file so it overrides the configuration defined above.
import_config "#{Mix.env}.exs"

# Configure phoenix generators
config :phoenix, :generators,
migration: true,
binary_id: false
2 changes: 1 addition & 1 deletion mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ defmodule Callum.Mixfile do
[
"ecto.setup": ["ecto.create", "ecto.migrate", "run priv/repo/seeds.exs"],
"ecto.reset": ["ecto.drop", "ecto.setup"],
"test": ["ecto.create", "ecto.migrate", "test --trace"]
"test": ["ecto.create --quiet", "ecto.migrate", "test --trace"]
]
end
end

0 comments on commit a58fb93

Please sign in to comment.