Skip to content

Commit 488bfc9

Browse files
committed
feat: support release label, using prev version, no sync mode, fix empty commit error
1 parent 536aa0f commit 488bfc9

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

please

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -222,10 +222,13 @@ while [[ $# -gt 0 ]]; do
222222
-v | --vfile) VFILE=1; shift 1 ;;
223223
-p | --public) PUBLIC="--access=public"; shift 1 ;;
224224
-c | --chlog) CHLOG=1; shift 1 ;;
225-
-H | --chash) GCFMT="$GCFMT [_%h_](https://github.com/$REPO/commit/%h)"; shift 1 ;;
225+
-H | --chash) GCFMT="$GCFMT [_%h_](https://$VCS/$REPO/$CMT/%h)"; shift 1 ;;
226226
-y | --yes) YES=1; shift 1 ;;
227227
-V | --version) NEXT_VERSION=$2; shift 2 ;;
228+
-L | --label) LABEL=$2; shift 2 ;;
229+
-P | --prev-version) PREV_VERSION=$2; shift 2 ;;
228230
-o | --organize) TYPES=$2; shift 2 ;;
231+
-N | --no-sync) NOSYNC=1; shift 1 ;;
229232
--before-* | --after-*) EVENTS[${1/--}]="$2"; shift 2 ;;
230233
version) version; exit 0 ;;
231234
minor) MINOR=1; shift 1 ;;
@@ -252,15 +255,16 @@ DEPLOY_BRANCH="${DEPLOY_BRANCH:-master}"
252255
trigger before-all
253256
if [ -z "$TRAVIS" ] || [ "$DEPLOY_BRANCH" == "$TRAVIS_BRANCH" ]; then
254257
info "Updating $DEPLOY_BRANCH ..."
255-
qgit stash && qgit checkout $DEPLOY_BRANCH && qgit fetch --tags && qgit pull origin $DEPLOY_BRANCH --rebase
258+
[[ $NOSYNC -eq 0 ]] && qgit stash && qgit checkout $DEPLOY_BRANCH && qgit fetch --tags && qgit pull origin $DEPLOY_BRANCH --rebase
256259
ok
257260
else
258261
info "Skip release"
259262
exit 0
260263
fi
261264

262265
info "Getting latest releases ..."
263-
VERSION=$(github "https://api.$GH_REPO/releases?per_page=1" | jq -r '.[0]?.tag_name?')
266+
[[ $PREV_VERSION ]] || PREV_VERSION=$(github "https://api.$GH_REPO/releases?per_page=1" | jq -r '.[0]?.tag_name?')
267+
VERSION="$PREV_VERSION"
264268
RANGE="$VERSION..HEAD"
265269

266270
[[ "null" == "$VERSION" ]] && { VERSION="0.0.0" RANGE=""; }
@@ -326,19 +330,21 @@ fi
326330
# push changes
327331
if [[ $GPUSH -eq 1 ]]; then
328332
trigger before-push
329-
qgit commit -m "chore: new version $NEXT_VERSION [skip ci] [ci skip]"
333+
qgit commit --allow-empty -m "chore: new version $NEXT_VERSION [skip ci] [ci skip]"
330334
info "Pushing pending commits ..."
331335
qgit push origin $DEPLOY_BRANCH
332336
ok
333337
fi
334338

339+
[[ "$VCS" == *"bitbucket"* ]] && trigger after-all && exit 0
340+
335341
# github release
336342
trigger before-vcs
337343
info "Releasing $NEXT_VERSION ..."
338344
COMMITS=$(printf %s "$COMMITS")
339345
LAST_RELEASE_ID=$(curl --silent -H "Authorization: token $GH_AUTH_TOKEN" \
340346
-H 'Content-Type: application/json' \
341-
-d "{\"tag_name\":\"$NEXT_VERSION\",\"name\":\"Version $NEXT_VERSION\",\"body\":\"$COMMITS\"}" \
347+
-d "{\"tag_name\":\"$NEXT_VERSION\",\"name\":\"${LABEL:-Version} $NEXT_VERSION\",\"body\":\"$COMMITS\",\"target_commitish\":\"$DEPLOY_BRANCH\"}" \
342348
https://api.$GH_REPO/releases \
343349
| jq -r '.id?')
344350

0 commit comments

Comments
 (0)