From 68cd9ab3ab82fcd880b18950d6ce90075fc25c13 Mon Sep 17 00:00:00 2001 From: Jeroen Ketema Date: Wed, 5 Nov 2025 09:33:06 +0100 Subject: [PATCH 1/4] Swift: Update to Swift 6.2.1 --- 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..29d552bd3e2d 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.1-RELEASE-133.tar.zst": "c5b96fe3e221accd9435f40dbd123d388c3418e1e451751ffd6e67339b063cf7", + "swift-prebuilt-Linux-swift-6.2.1-RELEASE-133.tar.zst": "1aa54c08025679cea2128499040790c4792debcbe214144b099469debe0d488d", + "resource-dir-macOS-swift-6.2.1-RELEASE-133.zip": "e7505fccfe0a537b1583b754fbdd0720415cd9c5e076b542be0d4ec976c955c8", + "resource-dir-Linux-swift-6.2.1-RELEASE-133.zip": "e08f6da9166c36d8cc1bb6c3c80f18664feade81ae193daeaada5a9a009748b0", } _staging_url = "https://github.com/dsp-testing/codeql-swift-artifacts/releases/download/staging-{}/{}" From a19f49b2acc67b87910dda49c9e9173195883e72 Mon Sep 17 00:00:00 2001 From: Jeroen Ketema Date: Wed, 5 Nov 2025 15:41:00 +0100 Subject: [PATCH 2/4] Swift: Update resources --- 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 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/swift/third_party/resources/resource-dir-linux.zip b/swift/third_party/resources/resource-dir-linux.zip index 6029e7657c01..970660d813f0 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:44888a0c944227bfcfa47f0e052f59c93b947e56ab070da877b0b0b4d79cdecb -size 385205623 +oid sha256:e08f6da9166c36d8cc1bb6c3c80f18664feade81ae193daeaada5a9a009748b0 +size 385198654 diff --git a/swift/third_party/resources/resource-dir-macos.zip b/swift/third_party/resources/resource-dir-macos.zip index 368fcc2551dc..c802f6fab297 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:64ac7f77b2d8b9112e0126ff69afb1a033ae940ff18bb8732be982a723610f2e -size 614058230 +oid sha256:e7505fccfe0a537b1583b754fbdd0720415cd9c5e076b542be0d4ec976c955c8 +size 613718859 diff --git a/swift/third_party/resources/swift-prebuilt-linux.tar.zst b/swift/third_party/resources/swift-prebuilt-linux.tar.zst index 2a507b6291d2..1f1dba6a9747 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:845dd07a3f04adc44ed83ec33ae2bc58a99c4d8f5fc6b8549c3adae91e2b03ff -size 132754495 +oid sha256:1aa54c08025679cea2128499040790c4792debcbe214144b099469debe0d488d +size 132780711 diff --git a/swift/third_party/resources/swift-prebuilt-macos.tar.zst b/swift/third_party/resources/swift-prebuilt-macos.tar.zst index 3f4ac76f795d..c66199543e14 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:0b2ccdd5a93bd0336866f85596987ee4274eaef3425ff95395e2aa8bec49a19e -size 115290456 +oid sha256:c5b96fe3e221accd9435f40dbd123d388c3418e1e451751ffd6e67339b063cf7 +size 115298493 From 6476f60cd4ef9444bb6982883f60b94d4336f1fa Mon Sep 17 00:00:00 2001 From: Jeroen Ketema Date: Wed, 5 Nov 2025 15:44:20 +0100 Subject: [PATCH 3/4] Swift: Add change note --- swift/ql/lib/change-notes/2025-10-22-swift-6.2.1.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 swift/ql/lib/change-notes/2025-10-22-swift-6.2.1.md diff --git a/swift/ql/lib/change-notes/2025-10-22-swift-6.2.1.md b/swift/ql/lib/change-notes/2025-10-22-swift-6.2.1.md new file mode 100644 index 000000000000..42a738ff746d --- /dev/null +++ b/swift/ql/lib/change-notes/2025-10-22-swift-6.2.1.md @@ -0,0 +1,4 @@ +--- +category: majorAnalysis +--- +* Upgraded to allow analysis of Swift 6.2.1. From a79c383fd5311e9529fe3337ef2e426a91373ec4 Mon Sep 17 00:00:00 2001 From: Jeroen Ketema Date: Wed, 5 Nov 2025 15:46:42 +0100 Subject: [PATCH 4/4] Swift: update `load.bzl` --- swift/third_party/load.bzl | 4 ---- 1 file changed, 4 deletions(-) diff --git a/swift/third_party/load.bzl b/swift/third_party/load.bzl index 29d552bd3e2d..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.1-RELEASE-133.tar.zst": "c5b96fe3e221accd9435f40dbd123d388c3418e1e451751ffd6e67339b063cf7", - "swift-prebuilt-Linux-swift-6.2.1-RELEASE-133.tar.zst": "1aa54c08025679cea2128499040790c4792debcbe214144b099469debe0d488d", - "resource-dir-macOS-swift-6.2.1-RELEASE-133.zip": "e7505fccfe0a537b1583b754fbdd0720415cd9c5e076b542be0d4ec976c955c8", - "resource-dir-Linux-swift-6.2.1-RELEASE-133.zip": "e08f6da9166c36d8cc1bb6c3c80f18664feade81ae193daeaada5a9a009748b0", } _staging_url = "https://github.com/dsp-testing/codeql-swift-artifacts/releases/download/staging-{}/{}"