Skip to content

Commit 99245fe

Browse files
committed
Update release script to use branch r3.0.62
- Change defaultBranch constant from '3.0.62' to 'r3.0.62' - Update README.md to reflect correct branch name throughout - Fixes branch name mismatch in release workflow
1 parent fbee5f9 commit 99245fe

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

README.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ The `make release` command implements a PR-based workflow:
6969

7070
3. **Version File Update**: If a new version was determined, the `VERSION` file is automatically updated with the new version number.
7171

72-
4. **Default Branch Update**: Fetches and updates the default branch (`3.0.62`) to ensure the release branch is created from the latest code.
72+
4. **Default Branch Update**: Fetches and updates the default branch (`r3.0.62`) to ensure the release branch is created from the latest code.
7373

7474
5. **Release Branch Creation**: Creates a new branch named `release/v{VERSION}` (e.g., `release/v3.0.62007`) from the updated default branch.
7575

@@ -86,7 +86,7 @@ The `make release` command implements a PR-based workflow:
8686
- Signs the checksum file with GPG (configured in CI/CD)
8787
- Creates a GitHub release
8888

89-
10. **Pull Request**: Create a pull request from the release branch (`release/v{VERSION}`) to the default branch (`3.0.62`).
89+
10. **Pull Request**: Create a pull request from the release branch (`release/v{VERSION}`) to the default branch (`r3.0.62`).
9090

9191
11. **Merge**: After CI completes successfully, merge the PR to complete the release.
9292

@@ -100,15 +100,15 @@ make release
100100

101101
The process will guide you through each step with clear prompts. You can cancel at any point if needed.
102102

103-
**Note**: The command automatically updates the default branch (`3.0.62`) before creating the release branch, so you can run it from any branch. The release branch will always be created from the latest version of the default branch.
103+
**Note**: The command automatically updates the default branch (`r3.0.62`) before creating the release branch, so you can run it from any branch. The release branch will always be created from the latest version of the default branch.
104104

105105
### Example Release Session
106106

107107
```bash
108108
$ make release
109-
Updating default branch (3.0.62) before creating release branch...
109+
Updating default branch (r3.0.62) before creating release branch...
110110
Fetching latest changes from origin...
111-
Checking out default branch 3.0.62...
111+
Checking out default branch r3.0.62...
112112
Default branch updated successfully.
113113
Checking if tag v3.0.62006 already exists...
114114
Tag v3.0.62006 already exists!
@@ -126,13 +126,13 @@ Release Summary:
126126
Tag: v3.0.62007
127127
Version: 3.0.62007
128128
Release Branch: release/v3.0.62007
129-
Target Branch: 3.0.62
129+
Target Branch: r3.0.62
130130
=========================================
131131

132132
Do you want to create release branch and tag v3.0.62007? (yes/no): yes
133133

134-
Creating release branch release/v3.0.62007 from updated default branch (3.0.62)...
135-
Release branch created from updated 3.0.62.
134+
Creating release branch release/v3.0.62007 from updated default branch (r3.0.62)...
135+
Release branch created from updated r3.0.62.
136136

137137
Committing VERSION file change...
138138
VERSION file change committed.
@@ -151,10 +151,10 @@ Next steps:
151151
1. GitHub Actions will automatically build the release when the tag is pushed.
152152
2. Create a pull request:
153153
- Source: release/v3.0.62007
154-
- Target: 3.0.62
155-
- URL: https://github.com/zph/terraform-provider-mysql/compare/3.0.62...release/v3.0.62007
154+
- Target: r3.0.62
155+
- URL: https://github.com/zph/terraform-provider-mysql/compare/r3.0.62...release/v3.0.62007
156156
3. Wait for CI to complete the release build.
157-
4. Review and merge the PR into 3.0.62 to complete the release.
157+
4. Review and merge the PR into r3.0.62 to complete the release.
158158

159159
To switch back to your previous branch, run:
160160
git checkout your-feature-branch

scripts/make-release.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
)
1717

1818
const (
19-
defaultBranch = "3.0.62"
19+
defaultBranch = "r3.0.62"
2020
versionFile = "VERSION"
2121
)
2222

0 commit comments

Comments
 (0)