Merge branch 'master' into ci-node-20

brianc · Mar 15, 2024 · 1586c05 · 1586c05
2 parents 3542fd7 + aedae81
commit 1586c05
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -7,6 +7,7 @@ permissions:
 
 jobs:
   lint:
+    timeout-minutes: 5
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -17,9 +18,10 @@ jobs:
         with:
           node-version: 18
           cache: yarn
-      - run: yarn install
+      - run: yarn install --frozen-lockfile
       - run: yarn lint
   build:
+    timeout-minutes: 10
     needs: lint
     services:
       postgres:
@@ -69,6 +71,6 @@ jobs:
         with:
           node-version: ${{ matrix.node }}
           cache: yarn
-      - run: yarn install
+      - run: yarn install --frozen-lockfile
       # TODO(bmc): get ssl tests working in ci
       - run: yarn test
diff --git a/docs/pages/apis/cursor.mdx b/docs/pages/apis/cursor.mdx
@@ -1,6 +1,6 @@
 ---
 title: pg.Cursor
-slug: /api/cursor
+slug: /apis/cursor
 ---
 
 A cursor can be used to efficiently read through large result sets without loading the entire result-set into memory ahead of time. It's useful to simulate a 'streaming' style read of data, or exit early from a large result set. The cursor is passed to `client.query` and is dispatched internally in a way very similar to how normal queries are sent, but the API it presents for consuming the result set is different.

diff --git a/docs/pages/apis/result.mdx b/docs/pages/apis/result.mdx
@@ -1,6 +1,6 @@
 ---
 title: pg.Result
-slug: /api/result
+slug: /apis/result
 ---
 
 The `pg.Result` shape is returned for every successful query.

diff --git a/docs/pages/apis/types.mdx b/docs/pages/apis/types.mdx
@@ -1,6 +1,6 @@
 ---
 title: Types
-slug: /api/types
+slug: /apis/types
 ---
 
 These docs are incomplete, for now please reference [pg-types docs](https://github.com/brianc/node-pg-types).
diff --git a/docs/pages/features/queries.mdx b/docs/pages/features/queries.mdx
@@ -123,7 +123,7 @@ console.log(res.rows[0]) // ['Brian', 'Carlson']
 
 ### Types
 
-You can pass in a custom set of type parsers to use when parsing the results of a particular query. The `types` property must conform to the [Types](/api/types) API. Here is an example in which every value is returned as a string:
+You can pass in a custom set of type parsers to use when parsing the results of a particular query. The `types` property must conform to the [Types](/apis/types) API. Here is an example in which every value is returned as a string:
 
 ```js
 const query = {