Fix subsplit repo URL

This commit is contained in:
Ben Thomson 2020-06-11 12:56:24 +08:00
parent 61af4f8d9e
commit d7cdefbba6
No known key found for this signature in database
GPG Key ID: 8BDB18DD0909BE22
2 changed files with 15 additions and 3 deletions

View File

@ -239,7 +239,7 @@ subsplit_publish()
if [ $RETURNCODE -eq 0 ]
then
PUSH_CMD="git push -q ${DRY_RUN} --force $REMOTE_NAME ${LOCAL_BRANCH}:${HEAD} >/dev/null 2>&1"
PUSH_CMD="git push -q ${DRY_RUN} --force $REMOTE_NAME ${LOCAL_BRANCH}:${HEAD}"
if [ -n "$VERBOSE" ];
then
@ -253,6 +253,12 @@ subsplit_publish()
else
$PUSH_CMD
fi
PUSHRETURNCODE=$?
if [ $PUSHRETURNCODE -eq 0 ]
then
say " - completed"
fi
fi
done
@ -296,7 +302,7 @@ subsplit_publish()
fi
say " - subtree split for '${TAG}'"
git subtree split -q --annotate="${ANNOTATE}" --prefix="$SUBPATH" --branch="$LOCAL_TAG" "$TAG" >/dev/null
git subtree split -q --annotate="${ANNOTATE}" --prefix="$SUBPATH" --branch="$LOCAL_TAG" "$TAG" >/dev/null 2>&1
RETURNCODE=$?
if [ -n "$VERBOSE" ];
@ -321,6 +327,12 @@ subsplit_publish()
else
$PUSH_CMD
fi
PUSHRETURNCODE=$?
if [ $PUSHRETURNCODE -eq 0 ]
then
say " - completed"
fi
fi
done
done

View File

@ -12,4 +12,4 @@ jobs:
with:
fetch-depth: 0
- name: Split demo theme
run: ${GITHUB_WORKSPACE}/.github/workflows/scripts/subsplit/git-subsplit.sh publish --debug --path="${GITHUB_WORKSPACE}" --heads="${GITHUB_REF/refs\/heads\//}" --no-tags themes/demo:https://bennothommo:${{ secrets.MAINTENANCE_TOKEN }}@github.com:octoberrain/demo-theme.git
run: ${GITHUB_WORKSPACE}/.github/workflows/scripts/subsplit/git-subsplit.sh publish --debug --path="${GITHUB_WORKSPACE}" --heads="${GITHUB_REF/refs\/heads\//}" --no-tags themes/demo:https://bennothommo:${{ secrets.MAINTENANCE_TOKEN }}@github.com/octoberrain/demo-theme.git