Skip to content

Commit 6ceeacd

Browse files
authored
Fix examples build (#3899)
* Fix examples build * Publish main repo artifacts locally * Sync builds * Fix init script? * Fix publishing of agent-for-testing
1 parent 052d00d commit 6ceeacd

File tree

6 files changed

+27
-38
lines changed

6 files changed

+27
-38
lines changed

.github/scripts/local.init.gradle.kts

+5-9
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
1-
addListener(object : BuildAdapter() {
2-
override fun projectsEvaluated(gradle: Gradle) {
3-
gradle.rootProject {
4-
repositories {
5-
mavenLocal()
6-
removeIf { it.name == "sonatype" }
7-
}
8-
}
1+
allprojects {
2+
repositories {
3+
mavenLocal()
4+
removeIf { it.name == "sonatype" }
95
}
10-
})
6+
}

.github/workflows/ci.yml

+7-4
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ jobs:
4848
- 11
4949
- 15
5050
vm:
51-
- hotspot
52-
- openj9
51+
- hotspot
52+
- openj9
5353
fail-fast: false
5454
steps:
5555
- uses: actions/[email protected]
@@ -192,12 +192,15 @@ jobs:
192192
path: ~/.gradle/wrapper
193193
key: ${{ runner.os }}-gradle-wrapper-cache-${{ hashFiles('examples/distro/gradle/wrapper/gradle-wrapper.properties') }}
194194

195+
- name: Local publish
196+
run: ./gradlew publishToMavenLocal
197+
195198
- name: Build distro
196-
run: ./gradlew build
199+
run: ./gradlew build --init-script ../../.github/scripts/local.init.gradle.kts
197200
working-directory: examples/distro
198201

199202
- name: Build extension
200-
run: ./gradlew build
203+
run: ./gradlew build --init-script ../../.github/scripts/local.init.gradle.kts
201204
working-directory: examples/extension
202205

203206
snapshot:

.github/workflows/pr.yml

+7-4
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ jobs:
5454
- 11
5555
- 15
5656
vm:
57-
- hotspot
58-
- openj9
57+
- hotspot
58+
- openj9
5959
fail-fast: false
6060
steps:
6161
- uses: actions/[email protected]
@@ -233,12 +233,15 @@ jobs:
233233
path: ~/.gradle/wrapper
234234
key: ${{ runner.os }}-gradle-wrapper-cache-${{ hashFiles('examples/distro/gradle/wrapper/gradle-wrapper.properties') }}
235235

236+
- name: Local publish
237+
run: ./gradlew publishToMavenLocal
238+
236239
- name: Build distro
237-
run: ./gradlew build
240+
run: ./gradlew build --init-script ../../.github/scripts/local.init.gradle.kts
238241
working-directory: examples/distro
239242

240243
- name: Build extension
241-
run: ./gradlew build
244+
run: ./gradlew build --init-script ../../.github/scripts/local.init.gradle.kts
242245
working-directory: examples/extension
243246

244247
accept-pr:

examples/distro/build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ subprojects {
88

99
ext {
1010
versions = [
11-
opentelemetry : "1.4.1",
12-
opentelemetryAlpha : "1.4.1-alpha",
13-
opentelemetryJavaagent : "1.5.0-SNAPSHOT",
14-
opentelemetryJavaagentAlpha: "1.5.0-alpha-SNAPSHOT",
11+
opentelemetry : "1.5.0",
12+
opentelemetryAlpha : "1.5.0-alpha",
13+
opentelemetryJavaagent : "1.6.0-SNAPSHOT",
14+
opentelemetryJavaagentAlpha: "1.6.0-alpha-SNAPSHOT",
1515
bytebuddy : "1.10.18",
1616
guava : "30.1-jre"
1717
]

examples/extension/build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ version '1.0'
2121

2222
ext {
2323
versions = [
24-
opentelemetry : "1.4.1",
25-
opentelemetryAlpha : "1.4.1-alpha",
26-
opentelemetryJavaagent : "1.5.0-SNAPSHOT",
27-
opentelemetryJavaagentAlpha: "1.5.0-alpha-SNAPSHOT",
24+
opentelemetry : "1.5.0",
25+
opentelemetryAlpha : "1.5.0-alpha",
26+
opentelemetryJavaagent : "1.6.0-SNAPSHOT",
27+
opentelemetryJavaagentAlpha: "1.6.0-alpha-SNAPSHOT",
2828
]
2929

3030
deps = [

testing/agent-for-testing/build.gradle.kts

-13
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,6 @@ project(":instrumentation").subprojects {
7070
}
7171

7272
tasks {
73-
jar {
74-
enabled = false
75-
}
76-
7773
val relocateJavaagentLibs by registering(ShadowJar::class) {
7874
configurations = listOf(javaagentLibs)
7975

@@ -116,15 +112,6 @@ tasks {
116112
jvmArgs("-javaagent:${shadowJar.get().archiveFile.get().asFile.absolutePath}")
117113
}
118114
}
119-
120-
// Because shadow does not use default configurations
121-
publishing {
122-
publications {
123-
named<MavenPublication>("maven") {
124-
project.shadow.component(this)
125-
}
126-
}
127-
}
128115
}
129116

130117
fun CopySpec.isolateClasses(jars: Iterable<File>) {

0 commit comments

Comments
 (0)