merge 6.x

Automattic · Jan 20, 2025 · 7c5bdd7 · 7c5bdd7
2 parents 73e81ab + e9b72f6
commit 7c5bdd7
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 13 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -2,18 +2,18 @@ name: Test
 on:
   pull_request:
     paths:
-      - '.github/workflows/test.yml'
-      - 'package.json'
-      - 'index.js'
-      - 'lib/**'
-      - 'test/**.js'
+      - ".github/workflows/test.yml"
+      - "package.json"
+      - "index.js"
+      - "lib/**"
+      - "test/**.js"
   push:
     paths:
-      - '.github/workflows/test.yml'
-      - 'package.json'
-      - 'index.js'
-      - 'lib/**'
-      - 'test/**.js'
+      - ".github/workflows/test.yml"
+      - "package.json"
+      - "index.js"
+      - "lib/**"
+      - "test/**.js"
 permissions:
   contents: read
 
@@ -85,7 +85,7 @@ jobs:
         with:
           name: coverage
           path: coverage
-  
+
   test-deno:
     runs-on: ubuntu-20.04
     name: Deno tests
@@ -117,7 +117,7 @@ jobs:
   test-replica-sets:
     needs:
       - test
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     name: Replica Set tests
     env:
       FORCE_COLOR: true

diff --git a/.npmignore b/.npmignore
@@ -57,3 +57,5 @@ tsconfig.json
 # scripts
 scripts/
 tools/
+
+valnotes.md
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,14 @@
+6.13.7 / 2025-01-20
+===================
+ * chore: re-release to force npm audit to pick up 6.x fix for CVE-2025-23061
+
 7.8.4 / 2025-01-13
 ===================
  * fix: disallow nested $where in populate match
 
 6.13.6 / 2025-01-13
 ===================
- * fix: disallow nested $where in populate match
+ * fix: disallow nested $where in populate match CVE-2025-23061
 
 7.8.3 / 2024-11-26
 ==================