Skip to content

[pull] master from DataDog:master #72

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

Merged
pull merged 4 commits into from
Aug 14, 2025
Merged

[pull] master from DataDog:master #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dfe958f
Revert "Run the Agent build on release branches instead of main from …
Kyle-Neale Aug 14, 2025
948fc06
Remove Kaspersky from requirements-agent-release.txt (#21071)
Kyle-Neale Aug 14, 2025
666189a
Enable greenhouse public docs (#21068)
cmlaverdiere Aug 14, 2025
9fb61e6
add bug fix release note (#21066)
abhi-modugula Aug 14, 2025
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
12 changes: 3 additions & 9 deletions .gitlab/build_agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
.build-agent-tpl:
variables:
# Pass these to triggered agent build job.
AGENT_BRANCH: "main"
RELEASE_VERSION_6: "nightly"
RELEASE_VERSION_7: "nightly-a7"
BUCKET_BRANCH: "dev"
Expand All @@ -11,23 +10,18 @@
# disable kitchen and e2e tests
RUN_KITCHEN_TESTS: "false"
RUN_E2E_TESTS: "off"
# Override AGENT_BRANCH for release branches
rules:
- if: $CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /^[0-9]+\.[0-9]+\.x$/
variables:
AGENT_BRANCH: $CI_MERGE_REQUEST_TARGET_BRANCH_NAME
stage: build
trigger:
project: DataDog/datadog-agent
branch: $AGENT_BRANCH
branch: main
# It's more convenient to directly show if downstream pipeline succeeded.
strategy: depend

build-agent-auto:
extends: .build-agent-tpl
rules:
# Do not run on release branches
- if: $CI_COMMIT_BRANCH =~ /^[0-9]+\.[0-9]+\.x$/
- if: $CI_COMMIT_BRANCH =~ /^7\.\d+\.x$/
when: never
# Only run if the branch is not a Github Merge Queue one.
- if: $CI_COMMIT_BRANCH !~ /^gh-readonly-queue.*/
Expand All @@ -45,7 +39,7 @@ build-agent-manual-release:
trigger:
branch: $CI_COMMIT_BRANCH
rules:
- if: $CI_COMMIT_BRANCH =~ /^[0-9]+\.[0-9]+\.x$/
- if: $CI_COMMIT_BRANCH =~ /^7\.\d+\.x$/
when: manual

# Always have the option to run manually the agent build manually against the agent's main
Expand Down
2 changes: 1 addition & 1 deletion greenhouse/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"manifest_version": "2.0.0",
"app_uuid": "7cf95e39-874e-4179-91da-bd142ff391ee",
"app_id": "greenhouse",
"display_on_public_website": false,
"display_on_public_website": true,
"tile": {
"overview": "README.md#Overview",
"configuration": "README.md#Setup",
Expand Down
1 change: 0 additions & 1 deletion requirements-agent-release.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ datadog-juniper-srx-firewall==1.0.0
datadog-kafka-consumer==6.7.0
datadog-kafka==4.0.0
datadog-karpenter==3.0.1
datadog-kaspersky==1.0.0
datadog-keda==2.0.1
datadog-keycloak==1.0.0
datadog-kong==6.0.1
Expand Down
6 changes: 6 additions & 0 deletions temporal_cloud/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# CHANGELOG - Temporal Cloud

## 1.0.1 / 2025-08-14

***Fixed***:

* Improved the way metrics are collected, which may resolve an issue that could cause some metrics to be missing for certain customers.

## 1.0.0 / 2024-11-26

***Added***:
Expand Down
Loading