From 6c5ed1a661f105e2a44dad72983407af7f75b46d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 1 Mar 2025 12:27:00 +0000 Subject: [PATCH 1/2] Update base tag for main to swift-DEVELOPMENT-SNAPSHOT-2025-02-28-a --- schemes/main/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schemes/main/manifest.json b/schemes/main/manifest.json index 80e9698..bd7ad0a 100644 --- a/schemes/main/manifest.json +++ b/schemes/main/manifest.json @@ -1,5 +1,5 @@ { - "base-tag": "swift-DEVELOPMENT-SNAPSHOT-2025-02-26-a", + "base-tag": "swift-DEVELOPMENT-SNAPSHOT-2025-02-28-a", "build-compiler": false, "icu4c": [], "libxml2": [ From 9fdddc06b0f603471a7f061bce54e43d06c4e3e5 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Sat, 1 Mar 2025 22:47:44 +0000 Subject: [PATCH 2/2] Use system installed swift to run swift-sdk-generator It seems recent nightly toolchain broke the swift-nio build --- tools/build/package-toolchain | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/build/package-toolchain b/tools/build/package-toolchain index 9bb37b2..adb3201 100755 --- a/tools/build/package-toolchain +++ b/tools/build/package-toolchain @@ -255,7 +255,7 @@ class PackageSwiftSDKAction(Action): sdk_generator_pkg_path = os.path.join( os.path.dirname(__file__), "..", "swift-sdk-generator") sdk_generator_args = [ - os.path.join(base_toolchain_path, "usr", "bin", "swift"), + "swift", "run", "--package-path", sdk_generator_pkg_path, "--", "swift-sdk-generator", "make-wasm-sdk", "--target-swift-package-path", target_toolchain_path,