Merge pull request #54 from DigitalSlideArchive/remove-development-hooks

Clean up merging girder-3-deployment branch.
DigitalSlideArchive · Feb 18, 2020 · 3b65b98 · 3b65b98
2 parents 0e47be9 + 03b9531
commit 3b65b98
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -270,10 +270,8 @@ workflows:
             tags:
               only: /^v.*/
             branches:
-              # Remove girder-3-deployment branch once it is merged
               only:
                 - master
-                - girder-3-deployment
   # We want to run a build periodically to make sure it still works and to use
   # all dependant libraries.  To republish dockers sooner, a build can be rerun
   # manually.
@@ -284,10 +282,8 @@ workflows:
           cron: "0 7 * * 1"
           filters:
             branches:
-              # Remove girder-3-deployment branch once it is merged
               only:
                 - master
-                - girder-3-deployment
     jobs:
       - build
       - test-cli: