From 7fdbd36c88bc03cabc30df6563b7ffce00c8a64a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Stormacq?= Date: Tue, 8 Oct 2024 12:10:36 +0200 Subject: [PATCH 1/2] fix local deps in plugin --- Plugins/AWSLambdaPackager/Plugin.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Plugins/AWSLambdaPackager/Plugin.swift b/Plugins/AWSLambdaPackager/Plugin.swift index f342c770..0d89b763 100644 --- a/Plugins/AWSLambdaPackager/Plugin.swift +++ b/Plugins/AWSLambdaPackager/Plugin.swift @@ -128,7 +128,7 @@ struct AWSLambdaPackager: CommandPlugin { print("building \"\(product.name)\"") let buildCommand = "swift build -c \(buildConfiguration.rawValue) --product \(product.name) --static-swift-stdlib" - if ProcessInfo.processInfo.environment["LAMBDA_USE_LOCAL_DEPS"] != nil { + if let localPath = ProcessInfo.processInfo.environment["LAMBDA_USE_LOCAL_DEPS"] { // when developing locally, we must have the full swift-aws-lambda-runtime project in the container // because Examples' Package.swift have a dependency on ../.. // just like Package.swift's examples assume ../.., we assume we are two levels below the root project @@ -136,7 +136,7 @@ struct AWSLambdaPackager: CommandPlugin { try Utils.execute( executable: dockerToolPath, arguments: [ - "run", "--rm", "--env", "LAMBDA_USE_LOCAL_DEPS=true", "-v", + "run", "--rm", "--env", "LAMBDA_USE_LOCAL_DEPS=\(localPath)", "-v", "\(packageDirectory.path())../..:/workspace", "-w", "/workspace/\(slice.joined(separator: "/"))", baseImage, "bash", "-cl", buildCommand, ], From c497140fa4f0c508e35ad33818ba7a884caf2f0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Stormacq?= Date: Tue, 8 Oct 2024 12:14:01 +0200 Subject: [PATCH 2/2] swift format --- Plugins/AWSLambdaPackager/Plugin.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/AWSLambdaPackager/Plugin.swift b/Plugins/AWSLambdaPackager/Plugin.swift index 0d89b763..01c28d47 100644 --- a/Plugins/AWSLambdaPackager/Plugin.swift +++ b/Plugins/AWSLambdaPackager/Plugin.swift @@ -128,7 +128,7 @@ struct AWSLambdaPackager: CommandPlugin { print("building \"\(product.name)\"") let buildCommand = "swift build -c \(buildConfiguration.rawValue) --product \(product.name) --static-swift-stdlib" - if let localPath = ProcessInfo.processInfo.environment["LAMBDA_USE_LOCAL_DEPS"] { + if let localPath = ProcessInfo.processInfo.environment["LAMBDA_USE_LOCAL_DEPS"] { // when developing locally, we must have the full swift-aws-lambda-runtime project in the container // because Examples' Package.swift have a dependency on ../.. // just like Package.swift's examples assume ../.., we assume we are two levels below the root project