mirrors/bonfire-app
1
0
Fork 0
mirror of https://github.com/bonfire-networks/bonfire-app.git synced 2024-05-17 00:22:40 +00:00
Code Issues Projects Releases Wiki Activity

attempt

Browse source
This commit is contained in:
Mayel de Borniol 2024-02-20 19:34:51 +00:00
parent 4ed7696eb9
commit c9e11b12fc
3 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
justfile
View file

@ -101,7 +101,7 @@ pre-setup flavour='classic':
mkdir -p config
mkdir -p ./flavours/$flavour/config/prod/
mkdir -p ./flavours/$flavour/config/dev/
cd config && (ln -sfn ../extensions/bonfire/deps.* ./ || ln -sfn ../deps/bonfire/deps.* ./)
just ln-spark-deps
cd config && ln -sfn ../flavours/classic/config/* ./ && ln -sfn ../flavours/$flavour/config/* ./
touch ./config/deps.path
mkdir -p data
@ -112,6 +112,9 @@ pre-setup flavour='classic':
mkdir -p forks/
chmod 700 .erlang.cookie
ln-spark-deps:
cd config && (ln -sfn ../extensions/bonfire/deps.* ./ || ln -sfn ../deps/bonfire/deps.* ./)
@pre-setup-env flavour='classic':
echo "Using flavour '$flavour' at flavours/$flavour with env '$MIX_ENV' with vars from ./flavours/$flavour/config/$ENV_ENV/.env "
test -f ./flavours/$flavour/config/$ENV_ENV/.env || just pre-setup-env-init flavours/$flavour/config flavours/$flavour/config || just pre-setup-env-init flavours/classic/config flavours/$flavour/config
@ -139,6 +142,8 @@ setup-dev:
just deps-clean-data
just deps-clean-api
just deps-clean-unused
WITH_GIT_DEPS=0 just deps-get
just ln-spark-deps
just deps-get
extension-post-install:

9
lib/mix/mixer.ex
View file

@ -110,7 +110,7 @@ if not Code.ensure_loaded?(Bonfire.Mixer) do
def forks_path(), do: System.get_env("FORKS_PATH", "extensions/")
def mess_sources(config_or_flavour) do
mess_source_files(System.get_env("WITH_FORKS", "1"))
mess_source_files(System.get_env("WITH_FORKS", "1"), System.get_env("WITH_GIT_DEPS", "1"))
|> enum_mess_sources(config_or_flavour)
end
@ -123,10 +123,13 @@ if not Code.ensure_loaded?(Bonfire.Mixer) do
|> Enum.map(&enum_mess_sources(&1, config_or_flavour))
end
defp mess_source_files("0"),
defp mess_source_files("0", "0"),
do: [[hex: "deps.flavour.hex"], [hex: "deps.hex"]]
defp mess_source_files("0", _1),
do: [[git: "deps.flavour.git", hex: "deps.flavour.hex"], [git: "deps.git", hex: "deps.hex"]]
defp mess_source_files(_),
defp mess_source_files(_1, _1),
do: [
[path: "deps.flavour.path", git: "deps.flavour.git", hex: "deps.flavour.hex"],
[path: "deps.path", git: "deps.git", hex: "deps.hex"]

1
mix.exs
View file

@ -17,7 +17,6 @@ defmodule Bonfire.Umbrella.MixProject do
@extra_deps [
# {:bonfire, git: "https://github.com/bonfire-networks/bonfire_spark"}, # putting it here breaks Dockerfile.release
{:floki, "~> 0.33", override: true}, # needed here for CI
# compilation
# {:tria, github: "hissssst/tria"},