Merge branch 'main' into update-bundle/codeql-bundle-v2.17.5

github · Jun 12, 2024 · b3642aa · b3642aa
2 parents 8d778e7 + 1fc6e20
commit b3642aa
Show file tree

Hide file tree

Showing 210 changed files with 2,921 additions and 1,285 deletions.
diff --git a/.github/workflows/__cleanup-db-cluster-dir.yml b/.github/workflows/__cleanup-db-cluster-dir.yml
diff --git a/.github/workflows/script/update-node-modules.sh b/.github/workflows/script/update-node-modules.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -eu
 
-if [ "$1" != "update" && "$1" != "check-only" ]; then
+if [ "$1" != "update" ] && [ "$1" != "check-only" ]; then
     >&2 echo "Failed: Invalid argument. Must be 'update' or 'check-only'"
     exit 1
 fi

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,11 @@ Note that the only difference between `v2` and `v3` of the CodeQL Action is the
 
 - Update default CodeQL bundle version to 2.17.5. [#2327](https://github.com/github/codeql-action/pull/2327)
 
+## 3.25.9 - 12 Jun 2024
+
+- Avoid failing database creation if the database folder already exists and contains some unexpected files. Requires CodeQL 2.18.0 or higher. [#2330](https://github.com/github/codeql-action/pull/2330)
+- The init Action will attempt to clean up the database cluster directory before creating a new database and at the end of the job. This will help to avoid issues where the database cluster directory is left in an inconsistent state. [#2332](https://github.com/github/codeql-action/pull/2332)
+
 ## 3.25.8 - 04 Jun 2024
 
 - Update default CodeQL bundle version to 2.17.4. [#2321](https://github.com/github/codeql-action/pull/2321)

diff --git a/lib/actions-util.js b/lib/actions-util.js
diff --git a/lib/actions-util.js.map b/lib/actions-util.js.map
diff --git a/lib/codeql.js b/lib/codeql.js
diff --git a/lib/codeql.js.map b/lib/codeql.js.map
diff --git a/lib/init-action-post-helper.js b/lib/init-action-post-helper.js
diff --git a/lib/init-action-post-helper.js.map b/lib/init-action-post-helper.js.map
diff --git a/lib/init-action.js b/lib/init-action.js