Merge branch '1.6.x' into 1.7.x

micrometer-metrics · Jul 14, 2021 · 5051e61 · 5051e61
2 parents 343d599 + 762e554
commit 5051e61
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -90,17 +90,17 @@ workflows:
             branches:
               ignore: /.*/
             tags:
-              only: /^v\d+\.\d+\.\d+(-(rc|milestone)\.\d+)?$/
+              only: /^v\d+\.\d+\.\d+(-(RC|M)\d+)?$/
       - docker-tests:
           filters:
             branches:
               ignore: /.*/
             tags:
-              only: /^v\d+\.\d+\.\d+(-(rc|milestone)\.\d+)?$/
+              only: /^v\d+\.\d+\.\d+(-(RC|M)\d+)?$/
       - deploy:
           requires:
             - build
             - docker-tests
           filters:
             tags:
-              only: /^v\d+\.\d+\.\d+(-(rc|milestone)\.\d+)?$/
+              only: /^v\d+\.\d+\.\d+(-(RC|M)\d+)?$/
diff --git a/gradle/deploy.sh b/gradle/deploy.sh
@@ -13,10 +13,10 @@ elif [ -z $CIRCLE_TAG ]; then
 elif [ $CIRCLE_TAG ]; then
   echo -e "Publishing Release => Branch ['$CIRCLE_BRANCH'] Tag ['$CIRCLE_TAG']"
   case "$CIRCLE_TAG" in
-  *-milestone*)
+  *-M*)
     ./gradlew -Prelease.disableGitChecks=true -Prelease.useLastTag=true -Prelease.stage=milestone candidate publishNebulaPublicationToMilestoneRepository $SWITCHES
     ;;
-  *-rc*)
+  *-RC*)
     ./gradlew -Prelease.disableGitChecks=true -Prelease.useLastTag=true -Prelease.stage=rc candidate publishNebulaPublicationToMilestoneRepository $SWITCHES
     ;;
   *)