Improve doc deploys, upgrade Elixir, config Sentry

joshsmith · joshsmith · commit eee40ce93c5c · 2016-10-02T11:52:55.000-07:00
- Update to Elixir 1.3.3
- Update Docker to Elixir 1.3.3
- Improve documentation deployment process
- Reconfigure Sentry to use proper env
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM elixir:1.3.2
+FROM elixir:1.3.3
 
 RUN apt-get update -qq && apt-get install -y build-essential
 
diff --git a/config/dev.exs b/config/dev.exs
@@ -47,3 +47,6 @@ config :guardian, Guardian,
   secret_key: "e62fb6e2746f6b1bf8b5b735ba816c2eae1d5d76e64f18f3fc647e308b0c159e"
 
 config :code_corps, :analytics, CodeCorps.Analytics.InMemory
+
+config :sentry,
+  environment_name: Mix.env || :dev
diff --git a/config/prod.exs b/config/prod.exs
@@ -38,6 +38,9 @@ config :guardian, Guardian,
 # Do not print debug messages in production
 config :logger, level: :info
 
+config :sentry,
+  environment_name: Mix.env || :prod
+
 # ## SSL Support
 #
 # To get SSL working, you will need to add the `https` key
diff --git a/config/staging.exs b/config/staging.exs
@@ -37,6 +37,9 @@ config :guardian, Guardian,
 # Do not print debug messages in production
 config :logger, level: :info
 
+config :sentry,
+  environment_name: Mix.env || :staging
+
 # ## SSL Support
 #
 # To get SSL working, you will need to add the `https` key
diff --git a/config/test.exs b/config/test.exs
@@ -34,3 +34,6 @@ config :code_corps, :icon_color_generator, CodeCorps.RandomIconColor.TestGenerat
 
 # Set Corsica logging to output no console warning when rejecting a request
 config :code_corps, :corsica_log_level, [rejected: :debug]
+
+config :sentry,
+  environment_name: Mix.env || :test
diff --git a/deploy_docs.sh b/deploy_docs.sh
@@ -3,19 +3,26 @@
 # Ensure exit codes other than 0 fail the build
 set -e
 
+# Pulling from GitHub
+echo "Pulling from GitHub..."
+mkdir -p doc
+cd doc
+git init
+if ! git remote | grep origin; then
+  git remote add origin git@github.com:code-corps/code-corps-api-github-pages.git
+  git pull
+fi
+cd ..
+
 # Generate docs
 echo "Generating docs..."
 mix docs
+cd doc
 
 # Push to GitHub
 echo "Pushing to GitHub..."
-cd doc
-git init
 git add .
 git commit -m "Update docs"
-if ! git remote | grep origin; then
-  git remote add origin git@github.com:code-corps/code-corps-api-github-pages.git
-fi
 git push -u origin master:gh-pages
 
 # Exit successfully
diff --git a/elixir_buildpack.config b/elixir_buildpack.config
@@ -1,2 +1,2 @@
 erlang_version=19.1
-elixir_version=1.3.2
+elixir_version=1.3.3
diff --git a/mix.exs b/mix.exs
@@ -4,7 +4,7 @@ defmodule CodeCorps.Mixfile do
   def project do
     [app: :code_corps,
      version: "0.0.1",
-     elixir: "1.3.2",
+     elixir: "1.3.3",
      elixirc_paths: elixirc_paths(Mix.env),
      compilers: [:phoenix, :gettext] ++ Mix.compilers,
      build_embedded: Mix.env == :prod,

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM elixir:1.3.2`
	`1`	`+FROM elixir:1.3.3`
`2`	`2`
`3`	`3`	`RUN apt-get update -qq && apt-get install -y build-essential`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,9 @@ config :guardian, Guardian,`
`38`	`38`	`# Do not print debug messages in production`
`39`	`39`	`config :logger, level: :info`
`40`	`40`
	`41`	`+config :sentry,`
	`42`	`+ environment_name: Mix.env \|\| :prod`
	`43`	`+`
`41`	`44`	`# ## SSL Support`
`42`	`45`	`#`
`43`	`46`	# To get SSL working, you will need to add the `https` key
Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,9 @@ config :guardian, Guardian,`
`37`	`37`	`# Do not print debug messages in production`
`38`	`38`	`config :logger, level: :info`
`39`	`39`
	`40`	`+config :sentry,`
	`41`	`+ environment_name: Mix.env \|\| :staging`
	`42`	`+`
`40`	`43`	`# ## SSL Support`
`41`	`44`	`#`
`42`	`45`	# To get SSL working, you will need to add the `https` key
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`erlang_version=19.1`
`2`		`-elixir_version=1.3.2`
	`2`	`+elixir_version=1.3.3`