Skip to content

Commit f0c3cc7

Browse files
committed
python_lambda: allow running from library_target_branch
1 parent 82f8bb9 commit f0c3cc7

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.github/actions/get_target_branch/action.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ runs:
1616
id: extract
1717
shell: bash
1818
run: |
19-
branch=$(echo "${INPUTS_TEXT}" | grep -ioP '\[(?:java|dotnet|python|ruby|php|golang|cpp|agent|nodejs|rust)@[^]]+(?=\])' | tr -d '[:space:]' || true)
19+
branch=$(echo "${INPUTS_TEXT}" | grep -ioP '\[(?:java|dotnet|python|python_lambda|ruby|php|golang|cpp|agent|nodejs|rust)@[^]]+(?=\])' | tr -d '[:space:]' || true)
2020
2121
echo "target-branch=${branch#*@}" >> $GITHUB_OUTPUT
2222

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)