From c054f5d46ae6a6beedb3b5902087d53cf179d7ff Mon Sep 17 00:00:00 2001 From: KShivendu Date: Fri, 1 Sep 2023 14:13:04 +0530 Subject: [PATCH] chores: Update CHANGELOG and dev tag script --- CHANGELOG.md | 2 +- addDevTag | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 323b96561..ef48052e2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [unreleased] -## [0.10.5] - 2023-09-30 +## [0.10.5] - 2023-09-01 - Add logic to retry network calls if the core returns status 429 diff --git a/addDevTag b/addDevTag index 1fd4f670e..2a0dd0df2 100755 --- a/addDevTag +++ b/addDevTag @@ -1,11 +1,5 @@ #!/bin/bash -# check if we need to merge master into this branch------------ -if [[ $(git log origin/master ^HEAD) ]]; then - echo "You need to merge master into this branch. Exiting" - exit 1 -fi - # get version------------ version=`cat setup.py | grep -e 'version='` while IFS='"' read -ra ADDR; do @@ -86,4 +80,4 @@ fi git tag dev-v$version $commit_hash -git push --tags \ No newline at end of file +git push --tags