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:
@@ -2,16 +2,12 @@ $current=$(git rev-parse --abbrev-ref HEAD)
|
||||
$dist='dist'
|
||||
$exists=$(git show-ref refs/heads/$dist)
|
||||
|
||||
echo $current
|
||||
echo $exists
|
||||
|
||||
if ($exists){
|
||||
git checkout $dist
|
||||
}else{
|
||||
## Make a new one
|
||||
git checkout -b $dist
|
||||
git branch -D $dist
|
||||
}
|
||||
|
||||
git checkout --orphan $dist
|
||||
|
||||
if(-Not $?){
|
||||
# If checkout failed
|
||||
echo "=========="
|
||||
@@ -19,14 +15,14 @@ if(-Not $?){
|
||||
exit 1
|
||||
}
|
||||
|
||||
git merge $current --strategy-option theirs
|
||||
|
||||
git reset
|
||||
rm -r -fo .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