Skip to content

Commit 18e6020

Browse files
authored
Merge branch 'main' into sebsto/pooltest
2 parents 995fc84 + 7322a36 commit 18e6020

File tree

5 files changed

+61
-48
lines changed

5 files changed

+61
-48
lines changed

Diff for: .github/workflows/scripts/check-archive-plugin.sh

+7
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,14 @@ unzip -l "${ZIP_FILE}" | grep --silent bootstrap
4040

4141
# if EXAMPLE is ResourcesPackaging, check if the ZIP file contains hello.txt
4242
if [ "$EXAMPLE" == "ResourcesPackaging" ]; then
43+
echo "Checking if resource was added to the ZIP file"
4344
unzip -l "${ZIP_FILE}" | grep --silent hello.txt
45+
SUCCESS=$?
46+
if [ "$SUCCESS" -eq 1 ]; then
47+
log "❌ Resource not found." && exit 1
48+
else
49+
log "✅ Resource found."
50+
fi
4451
fi
4552

4653
echo "✅ The archive plugin is OK with example ${EXAMPLE}"

Diff for: Examples/CDK/infra/package-lock.json

+49-43
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: Examples/CDK/infra/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
},
1212
"devDependencies": {
1313
"@types/jest": "^29.5.14",
14-
"@types/node": "22.7.9",
15-
"aws-cdk": "2.173.1",
14+
"@types/node": "22.13.10",
15+
"aws-cdk": "2.1003.0",
1616
"ts-node": "^10.9.2",
17-
"typescript": "~5.6.3"
17+
"typescript": "~5.8.2"
1818
},
1919
"dependencies": {
20-
"aws-cdk-lib": "^2.173.1",
20+
"aws-cdk-lib": "^2.183.0",
2121
"constructs": "^10.4.2"
2222
}
2323
}

Diff for: Plugins/AWSLambdaPackager/Plugin.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -250,11 +250,11 @@ struct AWSLambdaPackager: CommandPlugin {
250250
let relocatedResourcesDirectory = workingDirectory.appending(path: resourcesDirectoryName)
251251
if FileManager.default.fileExists(atPath: artifactURL.path()) {
252252
do {
253+
arguments.append(resourcesDirectoryName)
253254
try FileManager.default.copyItem(
254255
atPath: artifactURL.path(),
255256
toPath: relocatedResourcesDirectory.path()
256257
)
257-
arguments.append(resourcesDirectoryName)
258258
} catch let error as CocoaError {
259259

260260
// On Linux, when the build has been done with Docker,

0 commit comments

Comments
 (0)