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

attempt fix of #99

Browse source
This commit is contained in:
Mayel 2021-07-22 14:02:11 +02:00
parent 651b5361b7
commit 8e09a1e5bb
2 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.gitignore vendored
View file

@ -67,9 +67,10 @@ result
schema.graphql
deploy
.pnpm-debug.log
.pnpm-store
.pnpm-state.json
priv/localisation/*
# we use pnpm, so ignore others
assets/package-lock.json
assets/yarn.lock
priv/localisation/*
result

22
Makefile
View file

@ -153,9 +153,15 @@ deps.get: mix.remote~deps.get mix~deps.get ## Fetch locked version of non-forked
#### DEPENDENCY & EXTENSION RELATED COMMANDS ####
js.deps.get:
@make --no-print-directory js.deps.install dir=assets
# FIXME: make generic to apply to all extensions that bundle JS
(cd forks/bonfire_geolocate/assets && pnpm install) || (cd deps/bonfire_geolocate/assets && pnpm install)
cd ./assets && pnpm install
@make --no-print-directory js.deps.get.dep~bonfire_geolocate
js.deps.install:
@make --no-print-directory cmd cmd="cd $(dir) && pnpm install"
js.deps.get.dep~%:
@make --no-print-directory js.deps.install dir="forks/$*/assets" || make --no-print-directory js.deps.install dir="deps/$*/assets"
dep.clean~%:
@make mix~"deps.clean $* --build"
@ -390,13 +396,19 @@ docker.stop.web:
#### MISC COMMANDS ####
mix~%: init ## Run a specific mix command, eg: `make mix~deps.get` or `make mix~deps.update args=pointers`
cmd: init
ifeq ($(WITH_DOCKER), total)
docker-compose run web mix $* $(args)
docker-compose run web bash -c "$(cmd) $(args)"
else
mix $* $(args)
$(cmd) $(args)
endif
cmd~%: init ## Run a specific command, eg: `make cmd~"mix deps.get"` or `make cmd~deps.update args=pointers`
@make --no-print-directory cmd cmd="mix $*" $(args)
mix~%: init ## Run a specific mix command, eg: `make mix~deps.get` or `make mix~deps.update args=pointers`
@make --no-print-directory cmd cmd="mix $*" $(args)
mix.remote~%: init ## Run a specific mix command, while ignoring any deps cloned into ./forks, eg: `make mix~deps.get` or `make mix~deps.update args=pointers`
ifeq ($(WITH_DOCKER), total)
docker-compose run -e WITH_FORKS=0 web mix $* $(args)