Skip to content

Commit 6c98b46

Browse files
mccullsmcculls
authored
Merge branch 'master' into mcculls/support-context-provider-reregistration-during-tests
2 parents a9c3408 + 8bfbf8e commit 6c98b46

41 files changed

Lines changed: 366 additions & 2139 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/dependabot.yml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,13 @@ updates:
88
- package-ecosystem: "github-actions"
99
directory: "/"
1010
schedule:
11-
interval: "monthly"
11+
interval: "weekly"
12+
labels:
13+
- "comp: tooling"
14+
- "tag: dependencies"
15+
- "tag: no release notes"
16+
commit-message:
17+
prefix: "chore(ci): "
1218
groups:
1319
gh-actions-packages:
1420
patterns:

‎.github/workflows/README.md‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,16 @@ _Action:_
115115

116116
_Notes:_ Results are sent on both production and staging environments.
117117

118+
### check-ci-pipelines [🔗](check-ci-pipelines.yaml)
119+
120+
_Trigger:_ When opening or updating a PR.
121+
122+
_Action:_ This action will check all other continuous integration jobs (Github action, Gitlab, CircleCi), and will fail if any of them fails.
123+
The purpose of this job is to be required for PR merges, achieving Green CI Policy.
124+
It got an `ignored` parameters to exclude some jobs if they are temprorary failing.
125+
126+
_Recovery:_ Manually trigger the action on the desired branch.
127+
118128
### comment-on-submodule-update [🔗](comment-on-submodule-update.yaml)
119129

120130
_Trigger:_ When creating a PR commits to `master` or a `release/*` branch with a Git Submodule update.
@@ -137,14 +147,6 @@ _Action:_ Build the Java Client Library and runs [the system tests](https://gith
137147

138148
_Recovery:_ Manually trigger the action on the desired branch.
139149

140-
### all-green [🔗](all-green.yaml)
141-
142-
_Trigger:_ Any pull request.
143-
144-
_Action:_ This action will check all other jobs (Github action, Gitlab, CircleCi), and will fail if any of them fails. This action got an `ignored` paraemters to exclude some jobs if they are temprorary failing. The purpose of this job is to be required for merges, achieving Green CI Policy.
145-
146-
_Recovery:_ Manually trigger the action on the desired branch.
147-
148150
## Maintenance
149151

150152
GitHub actions should be part of the [repository allowed actions to run](https://github.com/DataDog/dd-trace-java/settings/actions).

.github/workflows/all-green.yml renamed to .github/workflows/check-ci-pipelines.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ permissions:
1616
statuses: read
1717

1818
jobs:
19-
all-jobs-are-green:
19+
check-ci-pipelines:
20+
name: Check CI Pipelines
2021
runs-on: ubuntu-latest
2122
steps:
2223
- name: Run Ensure CI Success

‎components/context/src/main/java/datadog/context/InferredProxyContext.java‎

Lines changed: 0 additions & 50 deletions
This file was deleted.

‎components/context/src/main/java/datadog/context/propagation/InferredProxyPropagator.java‎

Lines changed: 0 additions & 74 deletions
This file was deleted.

0 commit comments

Comments
 (0)