From bb9c72f889791cceef62074ede02edc9fbfb1d2a Mon Sep 17 00:00:00 2001 From: Jeroen Ketema Date: Sun, 25 May 2025 21:13:18 +0200 Subject: [PATCH 1/4] Swift: Update to Swift 6.1.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..ad05960e7f66 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.1-RELEASE-108.tar.zst": "2aaf6e7083c27a561d7212f88b3e15cbeb2bdf1d2363d310227d278937a4c2c9", + "swift-prebuilt-Linux-swift-6.1.1-RELEASE-108.tar.zst": "31cba2387c7e1ce4e73743935b0db65ea69fccf5c07bd2b392fd6815f5dffca5", + "resource-dir-macOS-swift-6.1.1-RELEASE-115.zip": "84e34d6af45883fe6d0103c2f36bbff3069ac068e671cb62d0d01d16e087362d", + "resource-dir-Linux-swift-6.1.1-RELEASE-115.zip": "1e00a730a93b85a5ba478590218e1f769792ec56501977cc72d941101c5c3657", } _staging_url = "https://github.com/dsp-testing/codeql-swift-artifacts/releases/download/staging-{}/{}" From 27fd7c48faf5214c5576c18a9dfe8d2373fde502 Mon Sep 17 00:00:00 2001 From: Jeroen Ketema Date: Mon, 26 May 2025 10:03:43 +0200 Subject: [PATCH 2/4] Swift: Update macOS runner --- .github/workflows/swift.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index 4af46d302ac6..df610a967025 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -32,7 +32,7 @@ jobs: if: github.repository_owner == 'github' strategy: matrix: - runner: [ubuntu-latest, macos-13-xlarge] + runner: [ubuntu-latest, macos-15-xlarge] fail-fast: false runs-on: ${{ matrix.runner }} steps: From 329d451d4db8e31a54bcad818433d10a7dfb035d Mon Sep 17 00:00:00 2001 From: Jeroen Ketema Date: Tue, 27 May 2025 10:53:57 +0200 Subject: [PATCH 3/4] Swift: Add change note --- swift/ql/lib/change-notes/2025-05-27-swift.6.1.1.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 swift/ql/lib/change-notes/2025-05-27-swift.6.1.1.md diff --git a/swift/ql/lib/change-notes/2025-05-27-swift.6.1.1.md b/swift/ql/lib/change-notes/2025-05-27-swift.6.1.1.md new file mode 100644 index 000000000000..19101e5b615b --- /dev/null +++ b/swift/ql/lib/change-notes/2025-05-27-swift.6.1.1.md @@ -0,0 +1,5 @@ + +--- +category: minorAnalysis +--- +* Updated to allow analysis of Swift 6.1.1. From f4636b9ef2bb822323fb9b9781f18a622e43c7ee Mon Sep 17 00:00:00 2001 From: Jeroen Ketema Date: Tue, 27 May 2025 10:56:52 +0200 Subject: [PATCH 4/4] Swift: Update Swift resources --- 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 ad05960e7f66..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.1-RELEASE-108.tar.zst": "2aaf6e7083c27a561d7212f88b3e15cbeb2bdf1d2363d310227d278937a4c2c9", - "swift-prebuilt-Linux-swift-6.1.1-RELEASE-108.tar.zst": "31cba2387c7e1ce4e73743935b0db65ea69fccf5c07bd2b392fd6815f5dffca5", - "resource-dir-macOS-swift-6.1.1-RELEASE-115.zip": "84e34d6af45883fe6d0103c2f36bbff3069ac068e671cb62d0d01d16e087362d", - "resource-dir-Linux-swift-6.1.1-RELEASE-115.zip": "1e00a730a93b85a5ba478590218e1f769792ec56501977cc72d941101c5c3657", } _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 8697b7c7afc5..e09b73863e59 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:874932f93c4ca6269ae3a9e9c841916b3fd88f65f5018eec8777a52dde56901d -size 293646067 +oid sha256:1e00a730a93b85a5ba478590218e1f769792ec56501977cc72d941101c5c3657 +size 293644020 diff --git a/swift/third_party/resources/resource-dir-macos.zip b/swift/third_party/resources/resource-dir-macos.zip index 95ffbc2e02ff..aaacc64a9e80 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:12bef89163486ac24d9ca00a5cc6ef3851b633e6fa63b7493c518e4d426e036c -size 595744464 +oid sha256:84e34d6af45883fe6d0103c2f36bbff3069ac068e671cb62d0d01d16e087362d +size 595760699 diff --git a/swift/third_party/resources/swift-prebuilt-linux.tar.zst b/swift/third_party/resources/swift-prebuilt-linux.tar.zst index 03490187210c..206ea6adb4de 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:d01b90bccfec46995bdf98a59339bd94e64257da99b4963148869c4a108bc2a9 -size 124360007 +oid sha256:31cba2387c7e1ce4e73743935b0db65ea69fccf5c07bd2b392fd6815f5dffca5 +size 124428345 diff --git a/swift/third_party/resources/swift-prebuilt-macos.tar.zst b/swift/third_party/resources/swift-prebuilt-macos.tar.zst index 692a8b05dc3b..bcbc7aaf4129 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:4dcfe858b5519327c9b0c99735b47fe75c7a5090793d917de1ba6e42795aa86d -size 105011965 +oid sha256:2aaf6e7083c27a561d7212f88b3e15cbeb2bdf1d2363d310227d278937a4c2c9 +size 104357336