Skip to content

Commit

Permalink
Updates
Browse files Browse the repository at this point in the history
  • Loading branch information
Callum Barratt committed May 18, 2016
1 parent bbac400 commit a6c353e
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 24 deletions.
4 changes: 2 additions & 2 deletions circle_pre_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ asdf plugin-add erlang https://github.com/HashNuke/asdf-erlang.git
asdf plugin-add elixir https://github.com/HashNuke/asdf-elixir.git

# Install erlang/elixir
asdf install erlang 18.2.1
asdf install elixir 1.2.1
asdf install erlang 18.3
asdf install elixir 1.2.5

# Get dependencies
yes | mix local.rebar
Expand Down
19 changes: 3 additions & 16 deletions config/dev.exs
Original file line number Diff line number Diff line change
@@ -1,19 +1,15 @@
use Mix.Config

# For development, we disable any cache and enable
# debugging and code reloading.
#
# The watchers configuration can be used to run external
# watchers to your application. For example, we use it
# with brunch.io to recompile .js and .css sources.
config :phoenix, :stacktrace_depth, 20
config :logger, :console, format: "[$level] $message\n"

config :callum, Callum.Endpoint,
http: [port: 4000],
debug_errors: true,
code_reloader: true,
check_origin: false,
watchers: [node: ["node_modules/brunch/bin/brunch", "watch", "--stdin"]]

# Watch static and templates for browser reloading.
config :callum, Callum.Endpoint,
live_reload: [
patterns: [
Expand All @@ -24,15 +20,6 @@ config :callum, Callum.Endpoint,
]
]

# Do not include metadata nor timestamps in development logs
config :logger, :console, format: "[$level] $message\n"

# Set a higher stacktrace during development.
# Do not configure such in production as keeping
# and calculating stacktraces is usually expensive.
config :phoenix, :stacktrace_depth, 20

# Configure your database
config :callum, Callum.Repo,
adapter: Ecto.Adapters.Postgres,
username: "postgres",
Expand Down
8 changes: 2 additions & 6 deletions config/test.exs
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
use Mix.Config

# We don't run a server during test. If one is required,
# you can enable the server option below.
config :logger, level: :warn

config :callum, Callum.Endpoint,
http: [port: 4001],
server: false

# Print only warnings and errors during test
config :logger, level: :warn

# Configure your database
if System.get_env("CIRCLECI") do
config :callum, Callum.Repo,
adapter: Ecto.Adapters.Postgres,
Expand Down

0 comments on commit a6c353e

Please sign in to comment.