Skip to content

Commit 1a16ef1

Browse files
authored
Fix dependabot (#6986)
Follow-up to #6977 Dependabot started failing after this because it was looking for all of the relative includes that were inside of `.github/project-root-duplicates/settings.gradle.kts`. The solution that seems to work (I've tested on my fork) is to split those includes out into a separate file, and `apply` that file. Also fixes a busted markdown link (probably should have sent that in a separate PR). Resolves #6989
1 parent 2642c11 commit 1a16ef1

File tree

6 files changed

+8
-3
lines changed

6 files changed

+8
-3
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
This directory and the two symlinks in it are used by the
2-
[dependabot configuration](../.github/dependabot.yml), because we can't include the root directory
2+
[dependabot configuration](../dependabot.yml), because we can't include the root directory
33
in the dependabot scanning since then it will pick up all of the old library versions that we
44
intentionally compile and test against.
55

File renamed without changes.
File renamed without changes.

.github/dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ updates:
4242
- package-ecosystem: "gradle"
4343
# need to scope gradle dependency updates down in this repo because most of the instrumentations
4444
# intentionally test against old library versions
45-
directory: ".github/project-root-duplicates"
45+
directory: "/.github/dependabot-symlinks"
4646
rebase-strategy: "disabled"
4747
schedule:
4848
interval: "daily"

include-conventions.gradle.kts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
// this file is only split out from settings.gradle.kts due to a dependabot limitation
2+
// for details see .github/project-root-duplicates/README.md
3+
includeBuild("conventions")

settings.gradle.kts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,9 @@ buildCache {
8484

8585
rootProject.name = "opentelemetry-java-instrumentation"
8686

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

8991
include(":custom-checks")
9092

0 commit comments

Comments
 (0)