From 5650c87c5548e7fbb076eb3eabd7051764393704 Mon Sep 17 00:00:00 2001 From: Jeroen Ketema Date: Wed, 10 Dec 2025 13:34:53 +0100 Subject: [PATCH 1/3] Swift: Update to Swift 6.2.2 --- swift/third_party/load.bzl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/swift/third_party/load.bzl b/swift/third_party/load.bzl index d19345a18803..1632ce4d743c 100644 --- a/swift/third_party/load.bzl +++ b/swift/third_party/load.bzl @@ -5,6 +5,10 @@ load("//misc/bazel:lfs.bzl", "lfs_archive", "lfs_files") _override = { # these are used to test new artifacts. Must be empty before merging to main + "swift-prebuilt-macOS-swift-6.2.2-RELEASE-136.tar.zst": "4b5e8997a99155330871e146288a8947fa224ba05e54539c795f21c082c7a940", + "swift-prebuilt-Linux-swift-6.2.2-RELEASE-136.tar.zst": "b5efba3953668d02a15b74bcf637831be99824702cfd74ac8cf53b31d89a4f2a", + "resource-dir-macOS-swift-6.2.2-RELEASE-136.zip": "b5e4bfbfaf1c9bae0bff0580797803a05328c08fffee47de406a5fa6cd7e19c7", + "resource-dir-Linux-swift-6.2.2-RELEASE-136.zip": "9d2aa88f3f9e2ff181a9c9607f95804b959fb334947cf72c566666b3be98ff2e", } _staging_url = "https://github.com/dsp-testing/codeql-swift-artifacts/releases/download/staging-{}/{}" From 0673c2d82be9c16bf07203933ccbea58d545b7d3 Mon Sep 17 00:00:00 2001 From: Jeroen Ketema Date: Thu, 11 Dec 2025 12:55:43 +0100 Subject: [PATCH 2/3] Swift: Update resources to Swift 6.2.2 --- swift/third_party/load.bzl | 4 ---- swift/third_party/resources/resource-dir-linux.zip | 4 ++-- swift/third_party/resources/resource-dir-macos.zip | 4 ++-- swift/third_party/resources/swift-prebuilt-linux.tar.zst | 4 ++-- swift/third_party/resources/swift-prebuilt-macos.tar.zst | 4 ++-- 5 files changed, 8 insertions(+), 12 deletions(-) diff --git a/swift/third_party/load.bzl b/swift/third_party/load.bzl index 1632ce4d743c..d19345a18803 100644 --- a/swift/third_party/load.bzl +++ b/swift/third_party/load.bzl @@ -5,10 +5,6 @@ load("//misc/bazel:lfs.bzl", "lfs_archive", "lfs_files") _override = { # these are used to test new artifacts. Must be empty before merging to main - "swift-prebuilt-macOS-swift-6.2.2-RELEASE-136.tar.zst": "4b5e8997a99155330871e146288a8947fa224ba05e54539c795f21c082c7a940", - "swift-prebuilt-Linux-swift-6.2.2-RELEASE-136.tar.zst": "b5efba3953668d02a15b74bcf637831be99824702cfd74ac8cf53b31d89a4f2a", - "resource-dir-macOS-swift-6.2.2-RELEASE-136.zip": "b5e4bfbfaf1c9bae0bff0580797803a05328c08fffee47de406a5fa6cd7e19c7", - "resource-dir-Linux-swift-6.2.2-RELEASE-136.zip": "9d2aa88f3f9e2ff181a9c9607f95804b959fb334947cf72c566666b3be98ff2e", } _staging_url = "https://github.com/dsp-testing/codeql-swift-artifacts/releases/download/staging-{}/{}" diff --git a/swift/third_party/resources/resource-dir-linux.zip b/swift/third_party/resources/resource-dir-linux.zip index 970660d813f0..21f02672b1b0 100644 --- a/swift/third_party/resources/resource-dir-linux.zip +++ b/swift/third_party/resources/resource-dir-linux.zip @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e08f6da9166c36d8cc1bb6c3c80f18664feade81ae193daeaada5a9a009748b0 -size 385198654 +oid sha256:9d2aa88f3f9e2ff181a9c9607f95804b959fb334947cf72c566666b3be98ff2e +size 385200751 diff --git a/swift/third_party/resources/resource-dir-macos.zip b/swift/third_party/resources/resource-dir-macos.zip index c802f6fab297..1a059eda5ef8 100644 --- a/swift/third_party/resources/resource-dir-macos.zip +++ b/swift/third_party/resources/resource-dir-macos.zip @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e7505fccfe0a537b1583b754fbdd0720415cd9c5e076b542be0d4ec976c955c8 -size 613718859 +oid sha256:b5e4bfbfaf1c9bae0bff0580797803a05328c08fffee47de406a5fa6cd7e19c7 +size 613729529 diff --git a/swift/third_party/resources/swift-prebuilt-linux.tar.zst b/swift/third_party/resources/swift-prebuilt-linux.tar.zst index 1f1dba6a9747..2770d5be19f7 100644 --- a/swift/third_party/resources/swift-prebuilt-linux.tar.zst +++ b/swift/third_party/resources/swift-prebuilt-linux.tar.zst @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1aa54c08025679cea2128499040790c4792debcbe214144b099469debe0d488d -size 132780711 +oid sha256:b5efba3953668d02a15b74bcf637831be99824702cfd74ac8cf53b31d89a4f2a +size 132824388 diff --git a/swift/third_party/resources/swift-prebuilt-macos.tar.zst b/swift/third_party/resources/swift-prebuilt-macos.tar.zst index c66199543e14..7121b9743a56 100644 --- a/swift/third_party/resources/swift-prebuilt-macos.tar.zst +++ b/swift/third_party/resources/swift-prebuilt-macos.tar.zst @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c5b96fe3e221accd9435f40dbd123d388c3418e1e451751ffd6e67339b063cf7 -size 115298493 +oid sha256:4b5e8997a99155330871e146288a8947fa224ba05e54539c795f21c082c7a940 +size 115298351 From a820c49a0d64f0391167f716292ff8c475db5ca0 Mon Sep 17 00:00:00 2001 From: Jeroen Ketema Date: Thu, 11 Dec 2025 12:58:38 +0100 Subject: [PATCH 3/3] Swift: Add change note --- swift/ql/lib/change-notes/2025-12-11-swift-6.2.2.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 swift/ql/lib/change-notes/2025-12-11-swift-6.2.2.md diff --git a/swift/ql/lib/change-notes/2025-12-11-swift-6.2.2.md b/swift/ql/lib/change-notes/2025-12-11-swift-6.2.2.md new file mode 100644 index 000000000000..27927802dba5 --- /dev/null +++ b/swift/ql/lib/change-notes/2025-12-11-swift-6.2.2.md @@ -0,0 +1,4 @@ +--- +category: majorAnalysis +--- +* Upgraded to allow analysis of Swift 6.2.2. \ No newline at end of file