Skip to content

Commit

Permalink
Use branch- prefix
Browse files Browse the repository at this point in the history
  • Loading branch information
julienrf committed Aug 26, 2024
1 parent 4e747f4 commit c6f4680
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,10 @@ Follow the procedure documented [here](https://stackoverflow.com/a/15505308/5617
Create a new [GitHub release](https://github.com/scylladb/scylla-migrator/releases), give it a tag name (please see below), a title, and a description, and then click Publish. A workflow will be automatically triggered and will build the application fat-jar and upload it as a release asset. Last, _fast-forward-merge_ the branch `master` into the current stable feature-branch:

~~~ sh
git checkout 1.0.x
git pull origin 1.0.x
git checkout branch-1.0.x
git pull origin branch-1.0.x
git merge --ff-only master
git push origin 1.0.x
git push origin branch-1.0.x
~~~

Rules for the release tag name:
Expand Down
4 changes: 2 additions & 2 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
TAGS = []
BRANCHES = [
"master",
"1.0.x"
"branch-1.0.x"
]
# Sets the latest version.
LATEST_VERSION = "1.0.x"
LATEST_VERSION = "branch-1.0.x"
# Set which versions are not released yet.
# Todo: List master when there is more than one version.
UNSTABLE_VERSIONS = ["master"]
Expand Down

0 comments on commit c6f4680

Please sign in to comment.