From 0a740514875e7b0969b7f7acd897a193a5e81b0a Mon Sep 17 00:00:00 2001 From: Sebastien Stormacq Date: Thu, 13 Mar 2025 20:50:20 +0100 Subject: [PATCH 1/2] fix integration test --- .github/workflows/scripts/check-archive-plugin.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/scripts/check-archive-plugin.sh b/.github/workflows/scripts/check-archive-plugin.sh index 3c127be8..218ee79a 100755 --- a/.github/workflows/scripts/check-archive-plugin.sh +++ b/.github/workflows/scripts/check-archive-plugin.sh @@ -40,7 +40,14 @@ unzip -l "${ZIP_FILE}" | grep --silent bootstrap # if EXAMPLE is ResourcesPackaging, check if the ZIP file contains hello.txt if [ "$EXAMPLE" == "ResourcesPackaging" ]; then + echo "Checking if resource was added to the ZIP file" unzip -l "${ZIP_FILE}" | grep --silent hello.txt + SUCCESS=$? + if [ "$SUCCESS" -eq 1 ]; then + log "❌ Resource not found." && exit 1 + else + log "✅ Resource found." + fi fi echo "✅ The archive plugin is OK with example ${EXAMPLE}" From e8fda086e555381a9694c86c68266f9c55f5e1f8 Mon Sep 17 00:00:00 2001 From: Sebastien Stormacq Date: Thu, 13 Mar 2025 21:42:30 +0100 Subject: [PATCH 2/2] fix resources packaging on Linux --- 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 01e47b3d..10d9c8a3 100644 --- a/Plugins/AWSLambdaPackager/Plugin.swift +++ b/Plugins/AWSLambdaPackager/Plugin.swift @@ -250,11 +250,11 @@ struct AWSLambdaPackager: CommandPlugin { let relocatedResourcesDirectory = workingDirectory.appending(path: resourcesDirectoryName) if FileManager.default.fileExists(atPath: artifactURL.path()) { do { + arguments.append(resourcesDirectoryName) try FileManager.default.copyItem( atPath: artifactURL.path(), toPath: relocatedResourcesDirectory.path() ) - arguments.append(resourcesDirectoryName) } catch let error as CocoaError { // On Linux, when the build has been done with Docker,