Minimum the host branch (#751)
* minimum dist branch * force command * clear multisrc by npm script * refactor: action name * fix: handle plugin error * fix: handle plugin error
This commit is contained in:
@@ -3,11 +3,11 @@ dist=dist
|
||||
exists=`git show-ref refs/heads/$dist`
|
||||
|
||||
if [ -n "$exists" ]; then
|
||||
git checkout $dist
|
||||
else
|
||||
git checkout -b $dist
|
||||
git branch -D $dist
|
||||
fi
|
||||
|
||||
git checkout --orphan $dist
|
||||
|
||||
if [ $? -eq 1 ]; then
|
||||
# If checkout failed
|
||||
echo "=========="
|
||||
@@ -15,15 +15,14 @@ if [ $? -eq 1 ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
git merge $current --strategy-option theirs
|
||||
|
||||
npm run clearMulti
|
||||
git reset
|
||||
rm -rf .js
|
||||
npm run clearMultisrc
|
||||
npm run generate
|
||||
npm run json
|
||||
git add .
|
||||
git add -f .dist .js/plugins
|
||||
git commit -m "Update plugins host"
|
||||
git add -f icons .dist .js/plugins
|
||||
git commit -m "Host plugins"
|
||||
git push -f origin $dist
|
||||
|
||||
git checkout $current
|
||||
git checkout -f $current
|
||||
|
||||
|
||||
Reference in New Issue
Block a user