From 42d73840aa4326a92daed63f03e37ff7205ca614 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20M=C3=A4der?= Date: Mon, 20 Sep 2021 13:34:44 +0200 Subject: [PATCH] Updated Release (markdown) --- Release.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Release.md b/Release.md index 59ce252..7cf30aa 100644 --- a/Release.md +++ b/Release.md @@ -11,9 +11,10 @@ 4. Switch back to your `develop` branch: `git checkout develop` 5. Merge the feature into the `develop` branch: `git merge --no-ff feature-name` 6. Clean up your local branches: `git branch -d feature-name` -2. Put the new version into the `VERSION` file: `echo "0.20.0" > VERSION` -3. Make a commit with the version file change: `git commit -m "Preparation for $(cat VERSION)" VERSION` -4. Push the branch [and make a new PR on Github from `develop` to `release`][new-pr] +1. Put the new version into the `VERSION` file: `echo "0.20.0" > VERSION` +1. Put the new version into the `docker-compose.yml` file: Replace `:${VERSION-v3.0-1.4.1}` with the latest version combination. +1. Make a commit with the version file change: `git commit -m "Preparation for $(cat VERSION)" VERSION` +1. Push the branch [and make a new PR on Github from `develop` to `release`][new-pr] Now another maintainer has to approve the PR.