Merge branch 'main' into 3.99

2021-04-23 08:40:25 -07:00
parent fb05da1fc3 d666f1efbb
commit 5504965bea
1 changed files with 9 additions and 1 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -105,6 +105,8 @@ workflows:
            branches:
               only:
                 - main
+                 - "3.99"
+                 - "4.0"
    jobs:
      - build:
          executor: node14
@@ -134,7 +136,7 @@ workflows:
             - build_node_14
          filters:
            branches:
-              only: main
+              ignore: /pull\/.*/ # Don't run on pull requests.
  push:
    jobs:
      - build:
@@ -161,3 +163,9 @@ workflows:
          name: test_node_10
          requires:
             - build_node_10
+      - test_browsers:
+          requires:
+             - build_node_14
+          filters:
+            branches:
+              ignore: /pull\/.*/ # Don't run on pull requests.