Squashed commit of the following:

commit d0b9e4c Author: Mark Riedesel <[email protected]> Date: Fri Nov 17 13:53:16 2023 -0600 ci: maybe don't cache node_modules and rely on .yarn/cache commit 514cb93 Author: Mark Riedesel <[email protected]> Date: Wed Nov 15 13:59:09 2023 -0600 ci: postgres:14.10 commit 2a9cdec Author: Mark Riedesel <[email protected]> Date: Wed Nov 15 13:58:01 2023 -0600 ci: node:lts commit 5bacce1 Author: Mark Riedesel <[email protected]> Date: Wed Nov 15 13:57:08 2023 -0600 ci: try node:20 and postgres:14 commit 6d47310 Author: Mark Riedesel <[email protected]> Date: Wed Nov 15 13:49:09 2023 -0600 switch cimg containers to use 'current' tag
Klowner · Nov 17, 2023 · fc9d9ad · fc9d9ad
1 parent fb89d76
commit fc9d9ad
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 19 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -11,8 +11,8 @@ workflows:
 jobs:
   run-tests:
     docker:
-      - image: cimg/node:21.0
-      - image: cimg/postgres:14.2
+      - image: cimg/node:lts
+      - image: cimg/postgres:14.10
         environment:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
@@ -33,14 +33,13 @@ jobs:
             sudo apt-get install postgresql-client
       - checkout
       - restore_cache:
-          key: packages-{{ checksum "yarn.lock" }}
+          key: yarn-packages-{{ checksum "yarn.lock" }}
       - run: yarn install --immutable
       - save_cache:
           paths:
-            - node_modules
             - .yarn/cache
             - .yarn/unplugged
-          key: packages-{{ checksum "yarn.lock" }}
+          key: yarn-packages-{{ checksum "yarn.lock" }}
       - run: yarn lerna run clean --scope "@tussle/*" --concurrency=1
       - run: yarn lerna run build --scope "@tussle/*" --concurrency=1
       - run: dockerize -wait tcp://localhost:5432 -timeout 1m

diff --git a/package.json b/package.json
@@ -29,7 +29,6 @@
     "@types/jest": "^29.2.3",
     "@typescript-eslint/eslint-plugin": "^5.45.0",
     "@typescript-eslint/parser": "^5.45.0",
-    "better-sqlite3": "^9.1.1",
     "coveralls": "^3.1.1",
     "eslint": "^8.26.0",
     "eslint-plugin-deprecation": "^1.3.2",

diff --git a/yarn.lock b/yarn.lock
@@ -3038,7 +3038,6 @@ __metadata:
     "@types/jest": ^29.2.3
     "@typescript-eslint/eslint-plugin": ^5.45.0
     "@typescript-eslint/parser": ^5.45.0
-    better-sqlite3: ^9.1.1
     coveralls: ^3.1.1
     eslint: ^8.26.0
     eslint-plugin-deprecation: ^1.3.2
@@ -6118,17 +6117,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"better-sqlite3@npm:^9.1.1":
-  version: 9.1.1
-  resolution: "better-sqlite3@npm:9.1.1"
-  dependencies:
-    bindings: ^1.5.0
-    node-gyp: latest
-    prebuild-install: ^7.1.1
-  checksum: b016b225b1c23717acb596848729ca9118d2496c3059643fcf23e11e22e63bf35bd1e61dd5b30c5b649d56df821521aba9c0f2cbad8fc7cdca9f3a4484e7ebcb
-  languageName: node
-  linkType: hard
-
 "bin-links@npm:^3.0.0":
   version: 3.0.3
   resolution: "bin-links@npm:3.0.3"
@@ -12720,7 +12708,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"prebuild-install@npm:^7.1.0, prebuild-install@npm:^7.1.1":
+"prebuild-install@npm:^7.1.0":
   version: 7.1.1
   resolution: "prebuild-install@npm:7.1.1"
   dependencies: