Skip to content

Commit

Permalink
Merge remote-tracking branch 'backblaze/master' into pdm
Browse files Browse the repository at this point in the history
  • Loading branch information
vbaltrusaitis-reef committed Feb 5, 2024
2 parents 82aec06 + 92ef2c8 commit 3463fff
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
os.environ["PDM_IGNORE_SAVED_PYTHON"] = "1"
os.environ["PDM_NO_LOCK"] = "1"

UPSTREAM_REPO_URL = '[email protected]:Backblaze/B2_Command_Line_Tool.git'

CI = os.environ.get('CI') is not None
CD = CI and (os.environ.get('CD') is not None)
INSTALL_SDK_FROM = os.environ.get('INSTALL_SDK_FROM')
Expand Down Expand Up @@ -650,10 +652,11 @@ def make_release_commit(session):

session.log(
f'CHANGELOG updated, changes ready to commit and push\n'
f' git remote add upstream {UPSTREAM_REPO_URL!r} 2>/dev/null || git remote get-url upstream\n'
f' git commit -m "release {version}"\n'
f' git tag v{version}\n'
f' git push {{UPSTREAM_NAME}} v{version}\n'
f' git push {{UPSTREAM_NAME}} {current_branch}'
f' git push upstream v{version}\n'
f' git push upstream {current_branch}'
)


Expand Down

0 comments on commit 3463fff

Please sign in to comment.