This commit is contained in:
Mayel de Borniol 2022-11-30 11:59:22 +13:00
parent 692f3f6cb6
commit 42574bec99
4 changed files with 18 additions and 7 deletions

View file

@ -22,6 +22,7 @@ assets/.parcel-cache
# Makefile
README*
priv/static
node_modules
assets/node_modules
.pnpm-store
data/search
@ -37,3 +38,11 @@ forks/*/.mix
forks/*/.hex
forks/*/_build
forks/*/deps
extensions/*/data/postgres
extensions/*/.git
extensions/*/.config
extensions/*/.npm
extensions/*/.mix
extensions/*/.hex
extensions/*/_build
extensions/*/deps

View file

@ -6,6 +6,7 @@
inputs: [
"{mix,.formatter,mess}.exs",
"{flavours,lib,test}/**/*.{ex,exs,sface,heex}",
"extensions/*/{config,lib,test}/**/*.{ex,exs,sface,heex}",
"forks/bonfire*/{config,lib,test}/**/*.{ex,exs,sface,heex}"
],
subdirectories: ["priv/*/migrations"],

2
assets
View file

@ -1 +1 @@
extensions/bonfire_ui_common/assets
deps/bonfire_ui_common/assets

View file

@ -21,6 +21,7 @@ DB_DOCKER_IMAGE := if arch() == "aarch64" { "ghcr.io/baosystems/postgis:12-3.3"
## Other configs - edit these here if necessary
FORKS_PATH := "extensions/"
EXTRA_FORKS_PATH := "forks/"
ORG_NAME := "bonfirenetworks"
APP_NAME := "bonfire"
APP_VSN_EXTRA := "beta"
@ -215,24 +216,24 @@ update-deps-all: deps-clean-unused pre-update-deps
# Update a specify dep (eg. `just update.dep pointers`)
update-dep dep:
@chmod +x git-publish.sh && ./git-publish.sh $FORKS_PATH/$dep pull
@chmod +x git-publish.sh && ./git-publish.sh $FORKS_PATH/$dep pull && ./git-publish.sh $EXTRA_FORKS_PATH/$dep pull
just mix-remote "deps.update $dep"
./js-deps-get.sh $dep
# Pull the latest commits from all forks
update-forks:
@jungle git fetch || echo "Jungle not available, will fetch one by one instead."
@chmod +x git-publish.sh && find $FORKS_PATH -mindepth 1 -maxdepth 1 -type d -exec ./git-publish.sh {} rebase \;
@chmod +x git-publish.sh && find $FORKS_PATH -mindepth 1 -maxdepth 1 -type d -exec ./git-publish.sh {} rebase \; && find $EXTRA_FORKS_PATH -mindepth 1 -maxdepth 1 -type d -exec ./git-publish.sh {} rebase \;
# TODO: run in parallel? find $FORKS_PATH -mindepth 1 -maxdepth 1 -type d | xargs -P 50 -I '{}' ./git-publish.sh '{}'
# Pull the latest commits from all forks
update-fork dep:
@chmod +x git-publish.sh && find $FORKS_PATH/$dep -mindepth 0 -maxdepth 0 -type d -exec ./git-publish.sh {} pull \;
@chmod +x git-publish.sh && find $FORKS_PATH/$dep -mindepth 0 -maxdepth 0 -type d -exec ./git-publish.sh {} pull \; && find $EXTRA_FORKS_PATH/$dep -mindepth 0 -maxdepth 0 -type d -exec ./git-publish.sh {} pull \;
# Fetch locked version of non-forked deps
deps-get:
just mix-remote deps.get
just mix deps.get
just mix-remote deps.get
just js-deps-get
deps-clean dep:
@ -247,7 +248,7 @@ deps-clean-api:
#### DEPENDENCY & EXTENSION RELATED COMMANDS ####
js-deps-get: js-ext-deps
@[ -d "extensions/bonfire_ui_common" ] && ln -s "extensions/bonfire_ui_common/assets" && echo "Assets served from the local UI.Common extension will be used" || ln -s "deps/bonfire_ui_common/assets"
@[ -d "extensions/bonfire_ui_common" ] && ln -sf "extensions/bonfire_ui_common/assets" && echo "Assets served from the local UI.Common extension will be used" || ln -sf "deps/bonfire_ui_common/assets"
js-ext-deps yarn_args='':
chmod +x ./config/deps.js.sh
@ -569,7 +570,7 @@ rebuild: init
shell:
just cmd bash
docker-stop-web:
@docker-stop-web:
-docker stop $WEB_CONTAINER
-docker rm $WEB_CONTAINER