ci: fix the publish workflow

aurelia · Sep 20, 2018 · ae76a30 · ae76a30
1 parent 814b813
commit ae76a30
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -265,7 +265,7 @@ jobs:
           name: Merge tag into release
           command: |
             git checkout release
-            git merge $CIRCLE_TAG --squash
+            git merge $CIRCLE_TAG --squash -Xtheirs
             git commit --no-edit
             git push
 
@@ -307,7 +307,7 @@ workflows:
       - e2e_browserstack:
           requires:
             - install
-      - publish_latest:
+      - request_publish_latest:
           type: approval
           requires:
             - build
@@ -317,6 +317,12 @@ workflows:
           filters:
             branches:
               only: release
+      - publish_latest:
+          requires:
+            - request_publish_latest
+          filters:
+            branches:
+              only: release
 
   # This workflow runs on tag push
   prepare_release: