change build-tes-provision in order to need approval

for renovate/nori branches
Financial-Times · Jun 8, 2022 · a2c61e0 · a2c61e0
1 parent 4fe19eb
commit a2c61e0
Showing 1 changed file with 23 additions and 18 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -61,7 +61,7 @@ references:
     branches:
       only: /(^renovate-.*|^nori/.*)/
 
-  filters_ignore_main_tags_renovate_nori: &filters_ignore_main_tags_renovate_nori
+  filters_ignore_tags_renovate_nori_main: &filters_ignore_tags_renovate_nori_main
     tags:
       ignore: /.*/
     branches:
@@ -145,16 +145,34 @@ workflows:
   build-test:
     jobs:
       - build:
+          name: build-no-main-v<< matrix.node-version >>
           filters:
-            <<: *filters_ignore_main_tags_renovate_nori
-          name: build-v<< matrix.node-version >>
+            <<: *filters_ignore_tags_renovate_nori_main
           matrix:
             parameters:
               node-version: [ "16.14", "14.19" ]
       - test:
+          name : test-no-main-v<< matrix.node-version >>
           requires:
-            - build-v<< matrix.node-version >>
-          name: test-v<< matrix.node-version >>
+            - build-no-main-v<< matrix.node-version >>
+          matrix:
+            parameters:
+              node-version: [ "16.14", "14.19" ]
+      - wait-for-approval:
+          type: approval
+          filters:
+            <<: *filters_only_renovate_nori
+      - build:
+          name: build-renovate-v<< matrix.node-version >>
+          requires:
+            - wait-for-approval
+          matrix:
+            parameters:
+              node-version: [ "16.14", "14.19" ]
+      - test:
+          name : test-renovate-v<< matrix.node-version >>
+          requires:
+            - build-renovate-v<< matrix.node-version >>
           matrix:
             parameters:
               node-version: [ "16.14", "14.19" ]
@@ -184,19 +202,6 @@ workflows:
           requires:
             - test-v16.14
 
-  renovate-nori-build-test-provision:
-    jobs:
-      - waiting-for-approval:
-          type: approval
-          filters:
-            <<: *filters_only_renovate_nori
-      - build:
-          requires:
-            - waiting-for-approval
-      - test:
-          requires:
-            - build
-
   nightly:
     triggers:
       - schedule: