Skip to content

Commit

Permalink
https://github.com/bonfire-networks/bonfire-app/issues/851
Browse files Browse the repository at this point in the history
  • Loading branch information
mayel committed Feb 22, 2024
1 parent a5657ac commit 70f31ea
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 28 deletions.
4 changes: 2 additions & 2 deletions config/config.exs
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ config_file = if Mix.env() == :test, do: "config/test.exs", else: "config/config

cond do
File.exists?("../bonfire/#{config_file}") ->
IO.puts("Load #{config_file} form fork")
IO.puts("Load #{config_file} from local clone of bonfire_spark")
import_config "../../bonfire/#{config_file}"

File.exists?("deps/bonfire/#{config_file}") ->
IO.puts("Load #{config_file} from dep")
IO.puts("Load #{config_file} from bonfire_spark dep")
import_config "../deps/bonfire/#{config_file}"

true ->
Expand Down
4 changes: 2 additions & 2 deletions deps.hex
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ zstream = "~> 0.6.4"
floki = ">= 0.0.0"
telemetry = "~> 1.1.0"

surface = "~> 0.11.1"
sourceror = "~> 0.12.0"
surface = "~> 0.11.2"
sourceror = "~> 1.0.0"
phoenix_live_view = "~> 0.19.0"
# phoenix_live_view = "~> 0.20.7"
phoenix = "~> 1.7.0"
Expand Down
2 changes: 1 addition & 1 deletion mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ defmodule Bonfire.UI.Me.MixProject do
updates: ["deps.get", "ecto.migrate", "js.deps.get"],
"ecto.setup": ["ecto.create", "ecto.migrate", "ecto.seeds"],
"ecto.reset": ["ecto.drop", "ecto.setup"],
test: ["ecto.create --quiet", "ecto.migrate --quiet", "test"]
"test.with-db": ["ecto.create --quiet", "ecto.migrate --quiet", "test"]
]
end
end

0 comments on commit 70f31ea

Please sign in to comment.