Skip to content

feat(ci): use feature branch if specified #7209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MilanGarnier wants to merge 7 commits into
base: main
Choose a base branch
from
+25 −8
Open

feat(ci): use feature branch if specified #7209

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0f0b363
use feature branch if specified
MilanGarnier Jun 24, 2026
185ce0c
~same normalization as in dd-trace-php, +oneliner for ghcr_login
MilanGarnier Jun 26, 2026
246d099
Merge branch 'main' into milan.garnier/php-checkout
MilanGarnier Jun 30, 2026
11c8b82
fix(ci): truncate PHP branch slug to 63 bytes to match GitLab's CI_CO…
MilanGarnier Jul 3, 2026
4d98282
prod check before checking library target branch (same behavior)
MilanGarnier Jul 3, 2026
d636364
Merge branch 'main' into milan.garnier/php-checkout
MilanGarnier Jul 3, 2026
65602f4
Merge branch 'main' into milan.garnier/php-checkout
MilanGarnier Jul 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 25 additions & 8 deletions utils/scripts/load-binary.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,13 @@ assert_target_branch_is_not_set() {
exit 1
}

ghcr_login_if_token_set() {
if [ -n "$GITHUB_TOKEN" ]; then
echo "Log to GHCR with token"
echo "$GITHUB_TOKEN" | docker login ghcr.io --password-stdin -u "actor" # username is ignored
fi
}

get_github_action_artifact() {
rm -rf artifacts artifacts.zip

Expand Down Expand Up @@ -137,10 +144,7 @@ elif [ "$TARGET" = "dotnet" ]; then
NORMALIZED_BRANCH=$(echo "$LIBRARY_TARGET_BRANCH" | sed 's/\//_/g')

rm -rf *.tar.gz
if [ -n "$GITHUB_TOKEN" ]; then
echo "Log to GHCR with token"
echo "$GITHUB_TOKEN" | docker login ghcr.io --password-stdin -u "actor" # username is ignored
fi
ghcr_login_if_token_set

../utils/scripts/docker_base_image.sh ghcr.io/datadog/dd-trace-dotnet/dd-trace-dotnet:${NORMALIZED_BRANCH} .

Expand All @@ -161,7 +165,19 @@ elif [ "$TARGET" = "ruby" ]; then
elif [ "$TARGET" = "php" ]; then
rm -rf *.tar.gz
mkdir -p temp
if [ $VERSION = 'dev' ]; then

if [ "${VERSION:-}" = 'prod' ]; then
../utils/scripts/docker_base_image.sh ghcr.io/datadog/dd-trace-php/dd-library-php:latest ./temp

elif [ -n "${LIBRARY_TARGET_BRANCH:-}" ]; then
# Match GitLab's CI_COMMIT_REF_SLUG: lowercase, non-alphanumeric → '-', collapse, truncate to 63 bytes and trim
NORMALIZED_BRANCH=$(echo "$LIBRARY_TARGET_BRANCH" | tr '[:upper:]' '[:lower:]' | sed 's/[^a-z0-9]/-/g;s/-\+/-/g;s/^-//;s/-$//' | cut -c1-63 | sed 's/-$//')
ghcr_login_if_token_set
../utils/scripts/docker_base_image.sh \
"ghcr.io/datadog/dd-trace-php/dd-library-php:${NORMALIZED_BRANCH}" \
./temp
Comment thread
MilanGarnier marked this conversation as resolved.

elif [ "${VERSION:-}" = 'dev' ]; then
URL="https://s3.us-east-1.amazonaws.com/dd-trace-php-builds/latest/datadog-setup.php"
echo "Downloading datadog-setup.php from: $URL"
curl --fail --location --silent --show-error --output ./temp/datadog-setup.php "$URL"
Expand All @@ -178,11 +194,12 @@ elif [ "$TARGET" = "php" ]; then
echo "Downloading dd-library-php from: $URL"
curl --fail --location --silent --show-error --output "./temp/dd-library-php-${VERSION_HASH}-$(arch)-linux-gnu.tar.gz" "$URL"
echo "dd-library-php $(arch) downloaded"
elif [ $VERSION = 'prod' ]; then
../utils/scripts/docker_base_image.sh ghcr.io/datadog/dd-trace-php/dd-library-php:latest ./temp

else
echo "Don't know how to load version $VERSION for $TARGET"
echo "Don't know how to load version ${VERSION:-} for $TARGET"
exit 1
fi

mv ./temp/dd-library-php*.tar.gz . && mv ./temp/datadog-setup.php . && rm -rf ./temp

elif [ "$TARGET" = "golang" ]; then
Expand Down
Loading