Merge pull request #601 from Financial-Times/LIF-1275-dotcom-tool-kit-upgrade

dotcom-tool-kit upgrade

Author: manasiSantFT

.circleci/config.yml

@@ -1,6 +1,8 @@
+# CONFIG GENERATED BY DOTCOM-TOOL-KIT, DO NOT EDIT BY HAND
 version: 2.1
 orbs:
   tool-kit: financial-times/dotcom-tool-kit@5
+  cloudsmith-oidc: ft-circleci-orbs/cloudsmith-oidc@1.0
 executors:
   node:
     docker:
@@ -13,13 +15,26 @@ jobs:
       - checkout
       - tool-kit/persist-workspace:
           path: .
+  teardown-review:
+    executor: node
+    steps:
+      - tool-kit/attach-workspace
+      - setup_remote_docker:
+          docker_layer_caching: true
+      - cloudsmith-oidc/authenticate_with_oidc
+      - run:
+          name: teardown-review
+          command: npx dotcom-tool-kit teardown:review
+    environment:
+      CIRCLE_BRANCH: << pipeline.event.github.pull_request.head.ref >>
+      CLOUDSMITH_ORGANISATION: financial-times
+      CLOUDSMITH_SERVICE_ACCOUNT: cp-lifecycle-read-write
 workflows:
   tool-kit:
-    when:
-      not:
-        equal:
-          - scheduled_pipeline
-          - << pipeline.trigger_source >>
+    when: |
+      pipeline.trigger_source != "scheduled_pipeline" and
+      (pipeline.event.name == "push" or (pipeline.event.name == "pull_request"
+      and pipeline.event.action != "closed"))
     jobs:
       - checkout:
           filters:
@@ -51,8 +66,6 @@ workflows:
           requires:
             - tool-kit/build
           filters:
-            tags:
-              only: /^v\d+\.\d+\.\d+(-.+)?/
             branches:
               ignore: main
           cloudsmith-org: financial-times
@@ -72,9 +85,6 @@ workflows:
           executor: node
           requires:
             - tool-kit/deploy-review
-          filters:
-            tags:
-              only: /^v\d+\.\d+\.\d+(-.+)?/
       - tool-kit/e2e-test-staging:
           executor: node
           requires:
@@ -126,3 +136,19 @@ workflows:
               ignore: main
           cloudsmith-org: financial-times
           cloudsmith-service-account: cp-lifecycle-read-write
+  pr-close:
+    jobs:
+      - checkout:
+          requires: []
+      - tool-kit/setup:
+          executor: node
+          requires:
+            - checkout
+      - teardown-review:
+          requires:
+            - tool-kit/setup
+    when: >
+      pipeline.trigger_source != "scheduled_pipeline" and
+
+      (pipeline.event.name == "pull_request" and pipeline.event.action ==
+      "closed")

.toolkitrc.yml

@@ -25,6 +25,8 @@ options:
         - "**/*.{js,jsx}"
     Mocha:
       configPath: "./.mocharc.json"
+    HakoDelete:
+      appName: next-syndication-api
   plugins:
     dotcom-tool-kit:
       allowNativeFetch: true