From 7fc538a910e06d8985210699fb9e6660b36066ff Mon Sep 17 00:00:00 2001 From: Vladislav Trotsenko Date: Wed, 11 Jan 2023 20:15:53 +0100 Subject: [PATCH] Technical/Update releasing flow (#151) * Updated CI scripts (tag/release) * Updated download script * Updated changelog --- .circleci/scripts/tag.sh | 4 ++++ CHANGELOG.md | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/.circleci/scripts/tag.sh b/.circleci/scripts/tag.sh index b22c488..fd0814e 100755 --- a/.circleci/scripts/tag.sh +++ b/.circleci/scripts/tag.sh @@ -21,6 +21,10 @@ then echo "Pushing new semver tag to GitHub..." git tag "$tag_candidate" git push --tags + echo "Updating develop branch with new semver tag..." + git checkout develop + git merge "$tag_candidate" --ff --no-edit + git push origin develop else echo "Latest changelog tag ($tag_candidate) already released on GitHub. Tagging is not required." fi diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a01766..0410dbf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [2.0.5] - 2023-01-11 + +### Updated + +- Updated `CI` scripts (tag/release) +- Updated download script + ## [2.0.4] - 2023-01-03 ### Updated