fixing so determine lockfile finds the correct lockfiles

CircleCI-Public · Dec 28, 2023 · 935a545 · 935a545
1 parent 8a85a24
commit 935a545
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 0 deletions.
diff --git a/.circleci/test-deploy.yml b/.circleci/test-deploy.yml
@@ -143,6 +143,11 @@ jobs:
       name: node/default
     steps:
       - checkout
+      - run:
+          name: Remove other lock files
+          command: |
+            rm ~/project/sample/package-lock.json
+            rm ~/project/sample/yarn.lock
       - node/install-packages:
           pkg-manager: pnpm
           cache-version: pnpm-v1

diff --git a/src/jobs/test.yml b/src/jobs/test.yml
@@ -69,6 +69,36 @@ executor:
 steps:
     - checkout
     - steps: << parameters.setup >>
+    - when:
+        condition:
+            and:
+                - equal: [ npm, << parameters.pkg-manager >> ]
+        steps:
+            - run:
+                name: Remove other lock files
+                command: |
+                    rm ~/project/sample/pnpm-lock.yaml
+                    rm ~/project/sample/yarn.lock
+    - when:
+        condition:
+            and:
+                - equal: [ pnpm, << parameters.pkg-manager >> ]
+        steps:
+            - run:
+                name: Remove other lock files
+                command: |
+                    rm ~/project/sample/package-lock.json
+                    rm ~/project/sample/yarn.lock
+    - when:
+        condition:
+            and:
+                - equal: [ yarn, << parameters.pkg-manager >> ]
+        steps:
+            - run:
+                name: Remove other lock files
+                command: |
+                    rm ~/project/sample/package-lock.json
+                    rm ~/project/sample/pnpm-lock.yaml
     - install-packages:
           app-dir: <<parameters.app-dir>>
           pkg-manager: <<parameters.pkg-manager>>