From c2a5d005161e09d59aa4d42f936d60e2aa65a568 Mon Sep 17 00:00:00 2001
From: Chris Hager <chris@linuxuser.at>
Date: Wed, 28 Feb 2024 09:37:21 +0100
Subject: [PATCH] v1.7.1 patch version bump

---
 RELEASE.md     | 15 +++++++++------
 config/vars.go |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/RELEASE.md b/RELEASE.md
index d00d8269..f14d8f30 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -44,10 +44,11 @@ curl localhost:18550/eth/v1/builder/status
 For example, creating a new release `v1.9`:
 
 1. Create a Github issue about the upcoming release ([example](https://github.com/flashbots/mev-boost/issues/524))
-1. Create a release branch (`release/v1.9`)
-1. Create an alpha release: `v1.9-alpha1`
-1. Test in testnets, iterate as needed, create more alpha versions
-1. When tests are complete, create the final release
+2. Create a release branch: `release/v1.9` (note: use the target version as branch name, don't add the `-alpha` suffix)
+3. Tag an alpha version: `v1.9-alpha1`
+4. Test in testnets, iterate as needed, create more alpha versions if needed
+5. When tests are complete, create the final tag and release
+6.
 
 ```bash
 # create a new branch
@@ -83,16 +84,18 @@ docker pull flashbots/mev-boost:v1.9a1
 
 To create a new version (with tag), follow all these steps! They are necessary to have the correct build version inside, and work with `go install`.
 
+* In the release branch
 * Update [`Version`](/config/vars.go) to final version to `v1.9`, and commit
 * Create final tags, both semver and pep440:
   * `git tag -s v1.9`
   * `git tag -s v1.9.0`
 * Update the `stable` branch:
   * `git checkout stable`
-  * `git merge tags/v1.9 --ff-only`
+  * `git merge tags/v1.9 --ff-only` (ff-only is important, otherwise git doesn't know the stable branch is based off the v1.9 tag!)
+* Update the `develop` branch:
   * `git checkout develop`
   * `git merge tags/v1.9 --ff-only`
-* Update `Version` in `config/vars.go` to next patch with `dev` suffix (eg. `v1.10-dev`) and commit to develop
+* Update `Version` in `config/vars.go` to next patch with `dev` suffix (eg. `v1.10-dev`) and commit to `develop` branch
 * Now push the `develop` and `stable` branches, as well as the tag: `git push origin develop stable --tags`
 
 Now check the Github CI actions for release activity: https://github.com/flashbots/mev-boost/actions
diff --git a/config/vars.go b/config/vars.go
index 2848416b..4f4b2732 100644
--- a/config/vars.go
+++ b/config/vars.go
@@ -8,7 +8,7 @@ import (
 
 var (
 	// Version is set at build time (must be a var, not a const!)
-	Version = "v1.8-dev"
+	Version = "v1.7.1"
 
 	// RFC3339Milli is a time format string based on time.RFC3339 but with millisecond precision
 	RFC3339Milli = "2006-01-02T15:04:05.999Z07:00"