Merge pull request #2953 from github/update-v3.29.1-428aea55f

Merge main into releases/v3

CHANGELOG.md

@@ -2,9 +2,10 @@
 
 See the [releases page](https://github.com/github/codeql-action/releases) for the relevant changes to the CodeQL CLI and language packs.
 
-## [UNRELEASED]
+## 3.29.1 - 27 Jun 2025
 
 - Fix bug in PR analysis where user-provided `include` query filter fails to exclude non-included queries. [#2938](https://github.com/github/codeql-action/pull/2938)
+- Update default CodeQL bundle version to 2.22.1. [#2950](https://github.com/github/codeql-action/pull/2950)
 
 ## 3.29.0 - 11 Jun 2025
 

lib/defaults.json

@@ -1,6 +1,6 @@
 {
-    "bundleVersion": "codeql-bundle-v2.22.0",
+    "bundleVersion": "codeql-bundle-v2.22.1",
-    "cliVersion": "2.22.0",
+    "cliVersion": "2.22.1",
-    "priorBundleVersion": "codeql-bundle-v2.21.4",
+    "priorBundleVersion": "codeql-bundle-v2.22.0",
-    "priorCliVersion": "2.21.4"
+    "priorCliVersion": "2.22.0"
 }

src/defaults.json

@@ -1,6 +1,6 @@
 {
-  "bundleVersion": "codeql-bundle-v2.22.0",
+  "bundleVersion": "codeql-bundle-v2.22.1",
-  "cliVersion": "2.22.0",
+  "cliVersion": "2.22.1",
-  "priorBundleVersion": "codeql-bundle-v2.21.4",
+  "priorBundleVersion": "codeql-bundle-v2.22.0",
-  "priorCliVersion": "2.21.4"
+  "priorCliVersion": "2.22.0"
 }

tests/multi-language-repo/.gitignore

@@ -0,0 +1,9 @@
+.DS_Store
+/.build
+/Packages
+/*.xcodeproj
+xcuserdata/
+DerivedData/
+.swiftpm/config/registries.json
+.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
+.netrc

tests/multi-language-repo/Package.swift

@@ -1,26 +1,15 @@
-// swift-tools-version: 5.7
+// swift-tools-version: 5.8
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
 
 let package = Package(
-    name: "helloWorld",
+    name: "multi-language-repo",
-    products: [
-        // Products define the executables and libraries a package produces, and make them visible to other packages.
-        .library(
-            name: "helloWorld",
-            targets: ["helloWorld"]),
-    ],
-    dependencies: [
-        // Dependencies declare other packages that this package depends on.
-        // .package(url: /* package url */, from: "1.0.0"),
-    ],
     targets: [
-        // Targets are the basic building blocks of a package. A target can define a module or a test suite.
+        // Targets are the basic building blocks of a package, defining a module or a test suite.
-        // Targets can depend on other targets in this package, and on products in packages this package depends on.
+        // Targets can depend on other targets in this package and products from dependencies.
-        .target(
+        .executableTarget(
-            name: "helloWorld",
+            name: "multi-language-repo",
-            path: "swift-custom-build/helloWorld"
+            path: "Sources"),
-        )
     ]
 )

tests/multi-language-repo/Sources/main.swift

@@ -0,0 +1,4 @@
+// The Swift Programming Language
+// https://docs.swift.org/swift-book
+
+print("Hello, world!")