From f4d23ecaabc6e84d35477adc6f914d7c2c90dbc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20M=C3=A4der?= Date: Fri, 1 Nov 2019 13:52:19 +0100 Subject: [PATCH] Updated Release (markdown) --- Release.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Release.md b/Release.md index ec35581..2937ab2 100644 --- a/Release.md +++ b/Release.md @@ -1,7 +1,13 @@ 1. Make sure you're on the `master` branch: `git checkout master` 1. Make sure, that the branch is clean: `git status` should not show any pending change. - 1. (Use `git stash` to stash them away for the release process.) + 1. Use `git stash` to stash them away for the release process. 1. Merge any relevant feature into `master`. + 1. Create a new local branch: `git checkout -b feature-name master` + 2. Pull the remote change into the current branch: `git pull https://github.com/other-user-or-org/netbox-docker.git remote-branch-name` + 3. Check whether the build still works: `./build.sh` + 4. Switch back to your master branch: `git checkout master` + 5. Merge the feature into the master 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. Tag that commit: `git tag "$(cat VERSION)"`