bug fixes
This commit is contained in:
parent
885e0d210c
commit
fa2a7fd4c9
2 changed files with 5 additions and 6 deletions
4
build.sh
4
build.sh
|
@ -63,10 +63,6 @@ if [ -n "${TEAMCITY_VERSION:-}" ]; then
|
||||||
security unlock-keychain -p ${KEYCHAIN_PASSWORD} osx-build.keychain
|
security unlock-keychain -p ${KEYCHAIN_PASSWORD} osx-build.keychain
|
||||||
fi
|
fi
|
||||||
|
|
||||||
set +e
|
|
||||||
export CI_BUILD_TAG=$(git describe --exact-match)
|
|
||||||
set -e
|
|
||||||
|
|
||||||
node_modules/.bin/build -p never
|
node_modules/.bin/build -p never
|
||||||
|
|
||||||
echo 'Build and packaging complete.'
|
echo 'Build and packaging complete.'
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
import argparse
|
import argparse
|
||||||
|
import glob
|
||||||
import json
|
import json
|
||||||
import logging
|
import logging
|
||||||
import os
|
import os
|
||||||
|
@ -34,6 +35,7 @@ def main(args=None):
|
||||||
else:
|
else:
|
||||||
artifact = get_artifact()
|
artifact = get_artifact()
|
||||||
|
|
||||||
|
current_tag = None
|
||||||
if not args.force:
|
if not args.force:
|
||||||
try:
|
try:
|
||||||
current_tag = subprocess.check_output(
|
current_tag = subprocess.check_output(
|
||||||
|
@ -73,7 +75,8 @@ def check_repo_has_tag(repo, target_tag):
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
|
||||||
def get_release(current_repo, current_tag, draft=False):
|
def get_release(current_repo, current_tag=None, draft=False):
|
||||||
|
assert current_tag or draft, 'either current_tag or draft must be set'
|
||||||
need_new_release = True
|
need_new_release = True
|
||||||
if not draft and current_tag:
|
if not draft and current_tag:
|
||||||
try:
|
try:
|
||||||
|
@ -86,7 +89,7 @@ def get_release(current_repo, current_tag, draft=False):
|
||||||
tag = current_tag or 'draft'
|
tag = current_tag or 'draft'
|
||||||
release_name = current_tag or 'draft'
|
release_name = current_tag or 'draft'
|
||||||
msg = 'Release' # TODO: parse changelogs to get a better message
|
msg = 'Release' # TODO: parse changelogs to get a better message
|
||||||
release = current_repo.create_git_release(current_tag, current_tag, msg, draft)
|
release = current_repo.create_git_release(tag, release_name, msg, draft)
|
||||||
return release
|
return release
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue