Fix CI for external contributors (#11008)

Arindam Bose · web-flow · commit 7c3a50d2f00a · 2021-09-13T15:53:35.000-07:00
* lazy mbx-ci installation * move check bundle size to separate job * derp * Remove prepare requirement from install mbxci * ensure ssh key is passed along from prepare * Revert "Remove prepare requirement from install mbxci" This reverts commit 3e85e9e. * Remove tags filter from install mbx-ci job * Fix branch name detection
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -11,6 +11,12 @@ workflows:
           filters:
             tags:
               only: /.*/
+      - install-mbx-ci:
+          requires:
+              - prepare
+          filters:
+            branches:
+              ignore: /pull\/[0-9]*/
       - lint:
           requires:
             - prepare
@@ -23,6 +29,14 @@ workflows:
           filters:
             tags:
               only: /.*/
+      - check-bundle-size:
+          requires:
+            - prepare
+            - install-mbx-ci
+            - build
+          filters:
+            tags:
+              only: /.*/
       - test-flow:
           requires:
             - prepare
@@ -74,13 +88,15 @@ workflows:
       - collect-stats:
           requires:
             - build
+            - install-mbx-ci
           filters:
             tags:
               ignore: /.*/
             branches:
               only: main
       - deploy-benchmarks:
           requires:
+            - install-mbx-ci
             - lint
             - build
             - test-flow
@@ -98,6 +114,7 @@ workflows:
                 - /release-.*/
       - deploy-release:
           requires:
+            - install-mbx-ci
             - lint
             - build
             - test-flow
@@ -123,12 +140,6 @@ jobs:
     <<: *defaults
     steps:
       - checkout
-      - run:
-          name: Install mbx-ci
-          command: |
-            curl -Ls https://mapbox-release-engineering.s3.amazonaws.com/mbx-ci/latest/mbx-ci-linux-amd64 > ~/mbx-ci &&
-            chmod 755 ~/mbx-ci &&
-            ~/mbx-ci aws setup
       - restore_cache:
           keys:
             - v4-yarn-{{ checksum "yarn.lock" }}
@@ -143,10 +154,23 @@ jobs:
           paths:
             - mapbox-gl-js
             - .ssh
+
+  install-mbx-ci:
+    <<: *defaults
+    steps:
+      - run:
+          name: Install mbx-ci
+          command: |
+            curl -Ls https://mapbox-release-engineering.s3.amazonaws.com/mbx-ci/latest/mbx-ci-linux-amd64 > ~/mbx-ci &&
+            chmod 755 ~/mbx-ci &&
+            ~/mbx-ci aws setup
+      - persist_to_workspace:
+          root: ~/
+          paths:
+            - .ssh
             - .aws
             - mbx-ci
 
-
   lint:
     <<: *defaults
     steps:
@@ -176,10 +200,6 @@ jobs:
       - run: yarn run build-style-spec
       - run: yarn run build-flow-types
       - run: yarn run test-build
-      - run:
-          name: Check bundle size
-          command: |
-            node build/check-bundle-size.js
       - store_artifacts:
           path: "dist"
       - store_artifacts:
@@ -189,6 +209,16 @@ jobs:
           paths:
             - mapbox-gl-js/dist
 
+  check-bundle-size:
+    <<: *defaults
+    steps:
+      - attach_workspace:
+          at: ~/
+      - run:
+          name: Check bundle size
+          command: |
+            node build/check-bundle-size.js
+
   test-flow:
     <<: *defaults
     steps:
