Skip to content
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.

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

Fix dependabot #6986

Merged
merged 6 commits into from
Oct 27, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
This directory and the two symlinks in it are used by the
[dependabot configuration](../.github/dependabot.yml), because we can't include the root directory
[dependabot configuration](../dependabot.yml), because we can't include the root directory
in the dependabot scanning since then it will pick up all of the old library versions that we
intentionally compile and test against.

Expand Down
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ updates:
- package-ecosystem: "gradle"
# need to scope gradle dependency updates down in this repo because most of the instrumentations
# intentionally test against old library versions
directory: ".github/project-root-duplicates"
directory: "/.github/dependabot-symlinks"
rebase-strategy: "disabled"
schedule:
interval: "daily"
Expand Down
3 changes: 3 additions & 0 deletions include-conventions.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// this file is only split out from settings.gradle.kts due to a dependabot limitation
// for details see .github/project-root-duplicates/README.md
includeBuild("conventions")
4 changes: 3 additions & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,9 @@ buildCache {

rootProject.name = "opentelemetry-java-instrumentation"

includeBuild("conventions")
// this is only split out due to a dependabot limitation
// for details see .github/project-root-duplicates/README.md
apply(from = "include-conventions.gradle.kts")

include(":custom-checks")

Expand Down