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

Just

Browse source
This commit is contained in:
Mayel de Borniol 2023-07-18 09:31:52 +01:00
parent 86bfaa6c3d
commit 5bf5055886
2 changed files with 24 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
git-publish.sh
View file

@ -1,6 +1,18 @@
#!/bin/bash
DIR="${1:-$PWD}"
function maye_rebase {
if [[ $2 == 'pull' ]]
then
git pull --rebase || fail "Please resolve conflicts before continuing."
fi
if [[ $2 == 'rebase' ]]
then
rebase
fi
}
function rebase {
# if jungle is available and we can assume fetches were already done by just and so we rebase, otherwise we rebase pull
command -v jungle && git rebase || git pull --rebase || fail "Please resolve conflicts before continuing."
@ -11,6 +23,7 @@ function fail {
exit "${2-1}" ## Return a code specified by $2, or 1 by default.
}
echo "Checking for changes in $DIR"
cd $DIR
@ -35,24 +48,16 @@ then
# fi
# merge/rebase local changes
rebase && echo "Published changes!"
maye_rebase
if [[ $3 != 'only' ]]
then
git push
git push && echo "Published changes!"
fi
else
set -e
echo "No local changes to push"
if [[ $2 == 'pull' ]]
then
git pull --rebase || fail "Please resolve conflicts before continuing."
fi
if [[ $2 == 'rebase' ]]
then
rebase
fi
maye_rebase
fi

15
justfile
View file

@ -257,6 +257,7 @@ update-deps-bonfire:
# Update every single dependency (use with caution)
update-deps-all: deps-unlock-unused pre-update-deps
just update-forks
just mix-remote "deps.update --all"
just deps-post-get
just js-ext-deps upgrade
@ -266,20 +267,20 @@ update-deps-all: deps-unlock-unused pre-update-deps
# Update a specify dep (eg. `just update.dep pointers`)
update-dep dep: pre-update-deps
@chmod +x git-publish.sh && ./git-publish.sh $EXT_PATH/$dep pull && ./git-publish.sh $EXTRA_FORKS_PATH/$dep pull
just update-fork $dep pull
just mix-remote "deps.update $dep"
just deps-post-get
./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 $EXT_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 $EXT_PATH -mindepth 1 -maxdepth 1 -type d | xargs -P 50 -I '{}' ./git-publish.sh '{}'
@update-forks:
jungle git fetch && just update-fork "" rebase || echo "Jungle not available, will fetch one by one instead." && just update-fork "" pull
# Pull the latest commits from all forks
update-fork dep:
@chmod +x git-publish.sh && find $EXT_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 \;
update-fork dep cmd='pull':
@chmod +x git-publish.sh
find $EXT_PATH/$dep -mindepth 0 -maxdepth 0 -type d -exec ./git-publish.sh {} $cmd \;
find $EXTRA_FORKS_PATH/$dep -mindepth 0 -maxdepth 0 -type d -exec ./git-publish.sh {} $cmd \;
# Fetch locked version of non-forked deps
deps-get *args='':