From 3f89dd3c4e20a76f5feed7fdec2dd0ee52498ac4 Mon Sep 17 00:00:00 2001 From: Jeroen Ketema Date: Thu, 5 Jun 2025 14:16:18 +0200 Subject: [PATCH 1/3] Swift: Update to Swift 6.1.2 --- swift/ql/lib/change-notes/2025-06-05-swift.6.1.2.md | 5 +++++ swift/third_party/load.bzl | 4 ++++ 2 files changed, 9 insertions(+) create mode 100644 swift/ql/lib/change-notes/2025-06-05-swift.6.1.2.md diff --git a/swift/ql/lib/change-notes/2025-06-05-swift.6.1.2.md b/swift/ql/lib/change-notes/2025-06-05-swift.6.1.2.md new file mode 100644 index 000000000000..448b8210756b --- /dev/null +++ b/swift/ql/lib/change-notes/2025-06-05-swift.6.1.2.md @@ -0,0 +1,5 @@ + +--- +category: minorAnalysis +--- +* Updated to allow analysis of Swift 6.1.2. diff --git a/swift/third_party/load.bzl b/swift/third_party/load.bzl index d19345a18803..a61e1ebd2896 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.1.2-RELEASE-109.tar.zst": "417c018d9aea00f9e33b26a3853ae540388276e6e4d02ef81955b2794b3a6152", + "swift-prebuilt-Linux-swift-6.1.2-RELEASE-109.tar.zst": "abc83ba5ca0c7009714593c3c875f29510597e470bac0722b3357a78880feee4", + "resource-dir-macOS-swift-6.1.2-RELEASE-116.zip": "9a22d9a4563ea0ad0b5051a997850d425d61ba5219ac35e9994d9a2f40a82f42", + "resource-dir-Linux-swift-6.1.2-RELEASE-116.zip": "f6c681b4e1d92ad848d35bf75c41d3e33474d45ce5f270cd814d879ca8fe8511", } _staging_url = "https://github.com/dsp-testing/codeql-swift-artifacts/releases/download/staging-{}/{}" From 5b5d85580899c8c2dee93144817461733f99b7d9 Mon Sep 17 00:00:00 2001 From: Jeroen Ketema Date: Thu, 5 Jun 2025 14:47:10 +0200 Subject: [PATCH 2/3] Swift: Remove empty line from change note --- swift/ql/lib/change-notes/2025-06-05-swift.6.1.2.md | 1 - 1 file changed, 1 deletion(-) diff --git a/swift/ql/lib/change-notes/2025-06-05-swift.6.1.2.md b/swift/ql/lib/change-notes/2025-06-05-swift.6.1.2.md index 448b8210756b..60adc9e1cfce 100644 --- a/swift/ql/lib/change-notes/2025-06-05-swift.6.1.2.md +++ b/swift/ql/lib/change-notes/2025-06-05-swift.6.1.2.md @@ -1,4 +1,3 @@ - --- category: minorAnalysis --- From 1f7a6ba5385341038ddb8354bd9470e04700c546 Mon Sep 17 00:00:00 2001 From: Jeroen Ketema Date: Fri, 6 Jun 2025 11:18:21 +0200 Subject: [PATCH 3/3] Swift: Update LFS --- 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 a61e1ebd2896..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.1.2-RELEASE-109.tar.zst": "417c018d9aea00f9e33b26a3853ae540388276e6e4d02ef81955b2794b3a6152", - "swift-prebuilt-Linux-swift-6.1.2-RELEASE-109.tar.zst": "abc83ba5ca0c7009714593c3c875f29510597e470bac0722b3357a78880feee4", - "resource-dir-macOS-swift-6.1.2-RELEASE-116.zip": "9a22d9a4563ea0ad0b5051a997850d425d61ba5219ac35e9994d9a2f40a82f42", - "resource-dir-Linux-swift-6.1.2-RELEASE-116.zip": "f6c681b4e1d92ad848d35bf75c41d3e33474d45ce5f270cd814d879ca8fe8511", } _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 e09b73863e59..251b0ca7fb64 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:1e00a730a93b85a5ba478590218e1f769792ec56501977cc72d941101c5c3657 -size 293644020 +oid sha256:f6c681b4e1d92ad848d35bf75c41d3e33474d45ce5f270cd814d879ca8fe8511 +size 291469999 diff --git a/swift/third_party/resources/resource-dir-macos.zip b/swift/third_party/resources/resource-dir-macos.zip index aaacc64a9e80..678fb09a8b7b 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:84e34d6af45883fe6d0103c2f36bbff3069ac068e671cb62d0d01d16e087362d -size 595760699 +oid sha256:9a22d9a4563ea0ad0b5051a997850d425d61ba5219ac35e9994d9a2f40a82f42 +size 593013753 diff --git a/swift/third_party/resources/swift-prebuilt-linux.tar.zst b/swift/third_party/resources/swift-prebuilt-linux.tar.zst index 206ea6adb4de..6efea3475860 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:31cba2387c7e1ce4e73743935b0db65ea69fccf5c07bd2b392fd6815f5dffca5 -size 124428345 +oid sha256:abc83ba5ca0c7009714593c3c875f29510597e470bac0722b3357a78880feee4 +size 124406561 diff --git a/swift/third_party/resources/swift-prebuilt-macos.tar.zst b/swift/third_party/resources/swift-prebuilt-macos.tar.zst index bcbc7aaf4129..ca29f3ebd3f1 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:2aaf6e7083c27a561d7212f88b3e15cbeb2bdf1d2363d310227d278937a4c2c9 -size 104357336 +oid sha256:417c018d9aea00f9e33b26a3853ae540388276e6e4d02ef81955b2794b3a6152 +size 104344626