chore: resolve conflicts

nestjs · Jun 14, 2023 · f36572f · f36572f
2 parents b59a8e5 + 1e607ce
commit f36572f
Show file tree

Hide file tree

Showing 5 changed files with 22,846 additions and 682 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,25 +3,25 @@ version: 2
 aliases:
   - &restore-cache
     restore_cache:
-        key: dependency-cache-{{ checksum "package.json" }}
+      key: dependency-cache-{{ checksum "package.json" }}
   - &install-deps
     run:
-        name: Install dependencies
-        command: npm ci
+      name: Install dependencies
+      command: npm ci --ignore-scripts
   - &build-packages
     run:
-        name: Build
-        command: npm run build
+      name: Build
+      command: npm run build
   - &run-unit-tests
     run:
-        name: Test
-        command: npm run test
+      name: Test
+      command: npm run test
 
 jobs:
   build:
     working_directory: ~/nest
     docker:
-      - image: cimg/node:20.2
+      - image: cimg/node:20.3
     steps:
       - checkout
       - run:
@@ -31,19 +31,19 @@ jobs:
           key: dependency-cache-{{ checksum "package.json" }}
       - run:
           name: Install dependencies
-          command: npm ci
+          command: npm ci --ignore-scripts
       - save_cache:
           key: dependency-cache-{{ checksum "package.json" }}
           paths:
             - ./node_modules
       - run:
           name: Build
-          command: npm run build    
+          command: npm run build
 
   unit_tests:
     working_directory: ~/nest
     docker:
-      - image: cimg/node:20.2
+      - image: cimg/node:20.3
     steps:
       - checkout
       - *restore-cache
@@ -59,4 +59,3 @@ workflows:
       - unit_tests:
           requires:
             - build
-