ci: remove releasing from CI, but avoid committing to develop

spokestack · Sep 18, 2020 · e1f7042 · e1f7042
1 parent 06e02c2
commit e1f7042
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 34 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -55,27 +55,6 @@ jobs:
           paths:
             - public
 
-  release_production:
-    docker:
-      - image: circleci/node:12
-    working_directory: ~/spokestack-website
-    steps:
-      - checkout
-      - *restore_npm_cache
-      - run: npm install --no-save
-      - *save_npm_cache
-
-      - run:
-          name: Set git config
-          command: |
-            git config user.email "4timmywil@gmail.com"
-            git config user.name "Timmy Willison"
-
-      # Run release script
-      - run:
-          name: Create release tag
-          command: npm run release -- --ci
-
   deploy_integration:
     docker:
       - image: circleci/node:12
@@ -129,19 +108,10 @@ jobs:
 workflows:
   version: 2
 
-  release:
-    jobs:
-      - release_production:
-          filters:
-            branches:
-              only: production
-
   test_and_deploy:
     jobs:
       - build:
           filters:
-            branches:
-              ignore: production
             tags:
               only:
                 - /\d+\.\d+\.\d+/
@@ -154,7 +124,7 @@ workflows:
       - deploy_production:
           filters:
             branches:
-              ignore: /.*/
+              only: production
             tags:
               only:
                 - /\d+\.\d+\.\d+/

diff --git a/package.json b/package.json
@@ -209,9 +209,7 @@
     },
     "git": {
       "commit": false,
-      "pushRepo": "git@github.com:spokestack/spokestack.io.git",
-      "requireBranch": "production",
-      "requireUpstream": false,
+      "requireBranch": "develop",
       "tagName": "${version}"
     },
     "npm": {