From c6f46806d2fc08ca92a0f2e4cb2646da223bfd69 Mon Sep 17 00:00:00 2001 From: Julien Richard-Foy Date: Mon, 26 Aug 2024 14:24:39 +0200 Subject: [PATCH] Use `branch-` prefix --- CONTRIBUTING.md | 6 +++--- docs/source/conf.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9dd7ffb..7628828 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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: diff --git a/docs/source/conf.py b/docs/source/conf.py index 44f9b95..c93f314 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -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"]