chore: updating release markdown and script to fetch master (open-telemetry#743)

alrex · web-flow · commit 960d0a35e48d · 2020-05-28T08:42:19.000-07:00
diff --git a/RELEASING.md b/RELEASING.md
@@ -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)
@@ -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:
@@ -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`)
diff --git a/scripts/prepare_release.sh b/scripts/prepare_release.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
 #
 # This script:
 #   1. parses the version number from the branch name
@@ -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}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!/bin/bash -x`
	`1`	`+#!/bin/bash`
`2`	`2`	`#`
`3`	`3`	`# This script:`
`4`	`4`	`# 1. parses the version number from the branch name`
`@@ -73,6 +73,7 @@ function update_changelog() {`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`# create the release branch`
	`76`	`+git fetch origin master`
`76`	`77`	`git checkout master`
`77`	`78`	`git reset --hard origin/master`
`78`	`79`	`git checkout -b release/${VERSION}`