Skip to content

Commit 8dbb65e

Browse files
committed
python_lambda: download datadog lambda python in an arch agnostic way
1 parent 88b03ae commit 8dbb65e

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

utils/build/docker/python_lambda/install_datadog_lambda.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,13 @@ if [ "$(find . -maxdepth 1 -name "*.zip" | wc -l)" = "1" ]; then
1010
unzip "${path}" -d /opt
1111
else
1212
echo "Fetching from latest GitHub release"
13-
curl -fsSLO https://github.com/DataDog/datadog-lambda-python/releases/latest/download/datadog_lambda_py-amd64-3.13.zip
14-
unzip -o datadog_lambda_py-amd64-3.13.zip -d /opt
13+
ARCH=$(uname -m | sed 's/x86_64/amd64/' | sed 's/aarch64/arm64/')
14+
echo https://github.com/DataDog/datadog-lambda-python/releases/latest/download/datadog_lambda_py-"$ARCH"-3.13.zip
15+
curl -fsSLO https://github.com/DataDog/datadog-lambda-python/releases/latest/download/datadog_lambda_py-"$ARCH"-3.13.zip
16+
unzip -o datadog_lambda_py-"$ARCH"-3.13.zip -d /opt
1517

16-
if [ ! -f datadog_lambda_py-amd64-3.13.zip ]; then
17-
echo "Failed to download datadog_lambda_py-amd64-3.13.zip"
18+
if [ ! -f datadog_lambda_py-"$ARCH"-3.13.zip ]; then
19+
echo "Failed to download datadog_lambda_py-""$ARCH""-3.13.zip"
1820
exit 1
1921
fi
2022
fi

utils/scripts/load-binary.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -351,9 +351,9 @@ elif [ "$TARGET" = "waf_rule_set" ]; then
351351

352352
elif [ "$TARGET" = "python_lambda" ]; then
353353
assert_version_is_dev
354-
assert_target_branch_is_not_set
355354

356-
get_github_action_artifact "DataDog/datadog-lambda-python" "build_layer.yml" "main" "datadog-lambda-python-3.13-amd64" "datadog_lambda_py-amd64-3.13.zip" "false"
355+
LIBRARY_TARGET_BRANCH="${LIBRARY_TARGET_BRANCH:-main}"
356+
get_github_action_artifact "DataDog/datadog-lambda-python" "build_layer.yml" $LIBRARY_TARGET_BRANCH "datadog-lambda-python-3.13-amd64" "datadog_lambda_py-amd64-3.13.zip" "false"
357357

358358
elif [ "$TARGET" = "otel_collector" ]; then
359359
assert_version_is_dev

0 commit comments

Comments
 (0)