Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
restjohn committed May 17, 2024
2 parents dcf7cf5 + bf7a4c6 commit 3788f8a
Show file tree
Hide file tree
Showing 4 changed files with 125 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/gh-pages-deploy.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: GH Pages Deploy

on:
workflow_dispatch:
workflow_dispatch:
push:
branches:
- master
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ jobs:

strategy:
matrix:
node-version: [ 16.x, 18.x ]
node-version: [16.x, 18.x, 20.x]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
- name: npm install, build, and test
Expand All @@ -29,8 +29,8 @@ jobs:
JOB_CONTEXT: ${{ toJson(matrix) }}
run: echo "$JOB_CONTEXT"
- name: Coveralls
if: matrix.node-version == '16.x'
uses: coverallsapp/github-action@master
if: matrix.node-version == '20.x'
uses: coverallsapp/github-action@v2
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
path-to-lcov: ./docs/coverage/lcov.info
3 changes: 3 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@
- Added in FeatureConnection, TileConnection, AttributesConnection and UserCustomConnections.
- Added GeoPackageCache

##### 4.2.6
- Upgrade the [`file-type`](https://www.npmjs.com/package/file-type) dependency to address [CVE-2022-36313](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-36313).

##### 4.2.5

- Fix a bug that set `undefined` on sql.js prepared statement values causing sql.js to throw an error.
Expand Down
119 changes: 116 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 3788f8a

Please sign in to comment.