diff options
Diffstat (limited to 'releng/create_release.xsh')
| -rw-r--r-- | releng/create_release.xsh | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/releng/create_release.xsh b/releng/create_release.xsh index 6f4df2142..373c079bc 100644 --- a/releng/create_release.xsh +++ b/releng/create_release.xsh @@ -11,6 +11,7 @@ from .environment import RelengEnvironment from . import keys from . import docker from .version import VERSION, RELEASE_NAME, MAJOR +from .gitutils import verify_are_on_tag, git_preconditions $RAISE_SUBPROC_ERROR = True $XONSH_SHOW_TRACEBACK = True @@ -38,15 +39,6 @@ def setup_creds(env: RelengEnvironment): $AWS_ENDPOINT_URL = environment.S3_ENDPOINT -def git_preconditions(): - # verify there is nothing in index ready to stage - proc = !(git diff-index --quiet --cached HEAD --) - assert proc.rtn == 0 - # verify there is nothing *stageable* and tracked - proc = !(git diff-files --quiet) - assert proc.rtn == 0 - - def official_release_commit_tag(force_tag=False): print('[+] Setting officialRelease in flake.nix and tagging') prev_branch = $(git symbolic-ref --short HEAD).strip() @@ -240,11 +232,6 @@ def prepare_release_notes(): git commit -m @(commit_msg) -def verify_are_on_tag(): - current_tag = $(git describe --tag).strip() - assert current_tag == VERSION - - def upload_artifacts(env: RelengEnvironment, noconfirm=False, no_check_git=False, force_push_tag=False): if not no_check_git: verify_are_on_tag() |