Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

infra: updating release markdown and script to fetch master #743

Merged
merged 3 commits into from
May 28, 2020
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion RELEASING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
This document explains how to publish all OT modules at version x.y.z. Ensure that you’re following semver when choosing a version number.

Release Process:
* [Checkout a clean repo](#checkout-a-clean-repo)
* [Create a new branch](#create-a-new-branch)
* [Open a Pull Request](#open-a-pull-request)
* [Create a Release](#Create-a-Release)
Expand All @@ -10,6 +11,8 @@ Release Process:
* [Check PyPI](#Check-PyPI)
* [Troubleshooting](#troubleshooting)

## Checkout a clean repo
- To avoid pushing untracked changes, check out the repo in a new dir

## Create a new branch
The following script does the following:
Expand Down Expand Up @@ -74,7 +77,6 @@ git commit -m

If for some reason the action failed, do it manually:

- To avoid pushing untracked changes, check out the repo in a new dir
- Switch to the release branch (important so we don't publish packages with "dev" versions)
- Build distributions with `./scripts/build.sh`
- Delete distributions we don't want to push (e.g. `testutil`)
Expand Down
3 changes: 2 additions & 1 deletion scripts/prepare_release.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash -x
#!/bin/bash
#
# This script:
# 1. parses the version number from the branch name
Expand Down Expand Up @@ -73,6 +73,7 @@ function update_changelog() {
}

# create the release branch
git fetch origin master
git checkout master
git reset --hard origin/master
git checkout -b release/${VERSION}
Expand Down