Skip to content

Commit 4526120

Browse files
committed
Merge branch 'main' into sebsto/doc
2 parents 1ed0fb0 + 8eddc28 commit 4526120

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

.github/workflows/pull_request.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ jobs:
1111
with:
1212
license_header_check_project_name: "SwiftAWSLambdaRuntime"
1313
shell_check_enabled: false
14+
python_lint_check_enabled: false
1415
api_breakage_check_container_image: "swift:6.0-noble"
1516
docs_check_container_image: "swift:6.0-noble"
1617
format_check_container_image: "swiftlang/swift:nightly-6.0-jammy"

Plugins/AWSLambdaPackager/Plugin.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ struct AWSLambdaPackager: CommandPlugin {
101101
try Utils.execute(
102102
executable: dockerToolPath,
103103
arguments: ["pull", baseImage],
104-
logLevel: .output
104+
logLevel: verboseLogging ? .debug : .output
105105
)
106106
}
107107

Plugins/AWSLambdaPackager/PluginUtils.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ struct Utils {
2727
logLevel: ProcessLogLevel
2828
) throws -> String {
2929
if logLevel >= .debug {
30-
print("\(executable.absoluteString) \(arguments.joined(separator: " "))")
30+
print("\(executable.path()) \(arguments.joined(separator: " "))")
3131
}
3232

3333
let fd = dup(1)
@@ -83,7 +83,7 @@ struct Utils {
8383
let process = Process()
8484
process.standardOutput = pipe
8585
process.standardError = pipe
86-
process.executableURL = URL(fileURLWithPath: executable.description)
86+
process.executableURL = executable
8787
process.arguments = arguments
8888
if let workingDirectory = customWorkingDirectory {
8989
process.currentDirectoryURL = URL(fileURLWithPath: workingDirectory.path())

0 commit comments

Comments
 (0)