Skip to content

Fix dubious ownership issue in libdatadog updater #3913

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
bwoebi wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −4
Open

Fix dubious ownership issue in libdatadog updater #3913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ generate-templates:
elif [ "${CI_COMMIT_BRANCH:-}" = "bot/libdatadog-latest" ]; then
# Feedback run after a bot commit: the submodule already points to the tested SHA.
# Don't export — generate-common.php must not inject fetch/checkout (no-op anyway).
set -x
apt update
apt install -y git
LIBDATADOG_SHA=$(git ls-tree HEAD libdatadog | awk '{print $3}')
printf 'LIBDATADOG_OVERRIDE_SHA=%s\nLIBDATADOG_FEEDBACK_RUN=true\n' "$LIBDATADOG_SHA" >> libdatadog.env
fi
Expand Down
1 change: 1 addition & 0 deletions .gitlab/generate-common.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ function windows_git_setup_with_packages() {
}

$step = <<<STEP
- git config --global --add safe.directory "\${CI_PROJECT_DIR}/libdatadog"
- git -C libdatadog fetch --depth=1 origin "$_libdatadog_sha" 2>&1
- git -C libdatadog checkout FETCH_HEAD
STEP;
Expand Down
8 changes: 4 additions & 4 deletions .gitlab/libdatadog-latest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,10 +211,10 @@ stages:
# Install Claude (nvm — no root required)
if ! command -v claude &>/dev/null; then
export NVM_DIR="${HOME}/.nvm"
curl -fsSL https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash - 2>&1
. "${NVM_DIR}/nvm.sh"
nvm install --lts --no-progress 2>&1
npm install -g @anthropic-ai/claude-code 2>&1
curl -fsSL https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash - >/dev/null 2>&1
. "${NVM_DIR}/nvm.sh" >/dev/null 2>&1
nvm install --lts --no-progress >/dev/null 2>&1
npm install -g @anthropic-ai/claude-code >/dev/null 2>&1
fi

AI_GATEWAY_TOKEN=$(_vault_jwt rapid-ai-platform) || {
Expand Down
Loading