Merge branch 'master-manual-tags' into 'master' (bce4899d) · Commits · e / os / 🚀 Releases

create_new_tag.sh

+6 −6

Original line number	Diff line number	Diff line
		@@ -49,13 +49,12 @@ sync_main_manifest(){
		}

		# Identify new tag name

		current_version=`echo $CI_COMMIT_REF_NAME \| sed 's/.*\-//'`
		if [ -z "$NEW_TAG" ];
		then
		cd $CI_PROJECT_DIR
		echo "Retrieving last tag"
		current_version=`echo $CI_COMMIT_REF_NAME \| sed 's/.*\-//'`
		latest_version=`git for-each-ref --sort=creatordate --format '%(refname)' refs/tags \| grep "\-$current_version" \| grep -v "beta" \| grep -v "rc" \| grep -ve ".\..\.." \| sed 's/.\///' \| tail -1`
		latest_version=`git for-each-ref --sort=creatordate --format '%(refname)' refs/tags \| grep "\-$current_version" \| grep -v "beta" \| grep -v "alpha" \| grep -v "rc" \| grep -ve ".\..\.." \| sed 's/.\///' \| tail -1`
		latest_version="${latest_version#*\.}"
		latest_version="${latest_version%\.*}"
		latest_version="${latest_version%\-*}"
		@@ -65,7 +64,8 @@ then

		cd "$SRC_DIR/$CI_COMMIT_REF_NAME"
		else
		new_version=$NEW_TAG
		new_version_without_android=$NEW_TAG
		new_version=$NEW_TAG-$current_version
		fi


		@@ -149,10 +149,10 @@ git push origin HEAD:$CI_COMMIT_REF_NAME

		if [ -z "$PREVERSION" ]
		then
		git tag v1.$((latest_version+1))-$current_version
		git tag $new_version_without_android-$current_version

		else
		git tag v1.$((latest_version+1))-${PREVERSION}-$current_version
		git tag $new_version_without_android-${PREVERSION}-$current_version
		fi
		git remote -v
		git push --tags