From c6afa01b7d79e46c9ff6670670ed4a457f7a2d61 Mon Sep 17 00:00:00 2001 From: Dmitry Dunaev Date: Wed, 30 Mar 2022 16:33:55 +0300 Subject: [PATCH] [WIFI-4648] Chg: create deploy release if there are changes in deploy release branch Signed-off-by: Dmitry Dunaev --- .github/git-release-tool/git-release-tool.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/git-release-tool/git-release-tool.sh b/.github/git-release-tool/git-release-tool.sh index e47d0a1..fe66d45 100755 --- a/.github/git-release-tool/git-release-tool.sh +++ b/.github/git-release-tool/git-release-tool.sh @@ -99,8 +99,9 @@ modify_deploy_repo_values() { sed "s/$REPO_DOCKER_COMPOSE_NAME=.*/$REPO_DOCKER_COMPOSE_NAME=$SERVICE_TAG/" -i docker-compose/.env.selfsigned sed "/${REPO_NAME_WITHOUT_SUFFIX#*/}@/s/ref=.*/ref=$SERVICE_TAG\"/g" -i chart/Chart.yaml done - if [[ "$(git diff | wc -l)" -eq "0" ]]; then - log_info "No changes in microservices found, new release is not required" + LATEST_RELEASE_TAG=$(git tag | grep $CURRENT_RELEASE_VERSION | tail -1) + if [[ "$(git diff | wc -l)" -eq "0" ]] && [[ "$(git diff $LATEST_RELEASE_TAG)" -eq "0" ]]; then + log_info "No changes in microservices and since the latest tag are found, new release is not required" else sed 's/^version: .*/version: '${NEW_RELEASE_TAG#v}'/' chart/Chart.yaml -i if [[ "$GIT_PUSH_CONFIRMED" == "true" ]]; then