Fix examples build (#3899)
* Fix examples build * Publish main repo artifacts locally * Sync builds * Fix init script? * Fix publishing of agent-for-testing
This commit is contained in:
parent
052d00d059
commit
6ceeacd381
|
@ -1,10 +1,6 @@
|
||||||
addListener(object : BuildAdapter() {
|
allprojects {
|
||||||
override fun projectsEvaluated(gradle: Gradle) {
|
|
||||||
gradle.rootProject {
|
|
||||||
repositories {
|
repositories {
|
||||||
mavenLocal()
|
mavenLocal()
|
||||||
removeIf { it.name == "sonatype" }
|
removeIf { it.name == "sonatype" }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
|
@ -192,12 +192,15 @@ jobs:
|
||||||
path: ~/.gradle/wrapper
|
path: ~/.gradle/wrapper
|
||||||
key: ${{ runner.os }}-gradle-wrapper-cache-${{ hashFiles('examples/distro/gradle/wrapper/gradle-wrapper.properties') }}
|
key: ${{ runner.os }}-gradle-wrapper-cache-${{ hashFiles('examples/distro/gradle/wrapper/gradle-wrapper.properties') }}
|
||||||
|
|
||||||
|
- name: Local publish
|
||||||
|
run: ./gradlew publishToMavenLocal
|
||||||
|
|
||||||
- name: Build distro
|
- name: Build distro
|
||||||
run: ./gradlew build
|
run: ./gradlew build --init-script ../../.github/scripts/local.init.gradle.kts
|
||||||
working-directory: examples/distro
|
working-directory: examples/distro
|
||||||
|
|
||||||
- name: Build extension
|
- name: Build extension
|
||||||
run: ./gradlew build
|
run: ./gradlew build --init-script ../../.github/scripts/local.init.gradle.kts
|
||||||
working-directory: examples/extension
|
working-directory: examples/extension
|
||||||
|
|
||||||
snapshot:
|
snapshot:
|
||||||
|
|
|
@ -233,12 +233,15 @@ jobs:
|
||||||
path: ~/.gradle/wrapper
|
path: ~/.gradle/wrapper
|
||||||
key: ${{ runner.os }}-gradle-wrapper-cache-${{ hashFiles('examples/distro/gradle/wrapper/gradle-wrapper.properties') }}
|
key: ${{ runner.os }}-gradle-wrapper-cache-${{ hashFiles('examples/distro/gradle/wrapper/gradle-wrapper.properties') }}
|
||||||
|
|
||||||
|
- name: Local publish
|
||||||
|
run: ./gradlew publishToMavenLocal
|
||||||
|
|
||||||
- name: Build distro
|
- name: Build distro
|
||||||
run: ./gradlew build
|
run: ./gradlew build --init-script ../../.github/scripts/local.init.gradle.kts
|
||||||
working-directory: examples/distro
|
working-directory: examples/distro
|
||||||
|
|
||||||
- name: Build extension
|
- name: Build extension
|
||||||
run: ./gradlew build
|
run: ./gradlew build --init-script ../../.github/scripts/local.init.gradle.kts
|
||||||
working-directory: examples/extension
|
working-directory: examples/extension
|
||||||
|
|
||||||
accept-pr:
|
accept-pr:
|
||||||
|
|
|
@ -8,10 +8,10 @@ subprojects {
|
||||||
|
|
||||||
ext {
|
ext {
|
||||||
versions = [
|
versions = [
|
||||||
opentelemetry : "1.4.1",
|
opentelemetry : "1.5.0",
|
||||||
opentelemetryAlpha : "1.4.1-alpha",
|
opentelemetryAlpha : "1.5.0-alpha",
|
||||||
opentelemetryJavaagent : "1.5.0-SNAPSHOT",
|
opentelemetryJavaagent : "1.6.0-SNAPSHOT",
|
||||||
opentelemetryJavaagentAlpha: "1.5.0-alpha-SNAPSHOT",
|
opentelemetryJavaagentAlpha: "1.6.0-alpha-SNAPSHOT",
|
||||||
bytebuddy : "1.10.18",
|
bytebuddy : "1.10.18",
|
||||||
guava : "30.1-jre"
|
guava : "30.1-jre"
|
||||||
]
|
]
|
||||||
|
|
|
@ -21,10 +21,10 @@ version '1.0'
|
||||||
|
|
||||||
ext {
|
ext {
|
||||||
versions = [
|
versions = [
|
||||||
opentelemetry : "1.4.1",
|
opentelemetry : "1.5.0",
|
||||||
opentelemetryAlpha : "1.4.1-alpha",
|
opentelemetryAlpha : "1.5.0-alpha",
|
||||||
opentelemetryJavaagent : "1.5.0-SNAPSHOT",
|
opentelemetryJavaagent : "1.6.0-SNAPSHOT",
|
||||||
opentelemetryJavaagentAlpha: "1.5.0-alpha-SNAPSHOT",
|
opentelemetryJavaagentAlpha: "1.6.0-alpha-SNAPSHOT",
|
||||||
]
|
]
|
||||||
|
|
||||||
deps = [
|
deps = [
|
||||||
|
|
|
@ -70,10 +70,6 @@ project(":instrumentation").subprojects {
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks {
|
tasks {
|
||||||
jar {
|
|
||||||
enabled = false
|
|
||||||
}
|
|
||||||
|
|
||||||
val relocateJavaagentLibs by registering(ShadowJar::class) {
|
val relocateJavaagentLibs by registering(ShadowJar::class) {
|
||||||
configurations = listOf(javaagentLibs)
|
configurations = listOf(javaagentLibs)
|
||||||
|
|
||||||
|
@ -116,15 +112,6 @@ tasks {
|
||||||
jvmArgs("-javaagent:${shadowJar.get().archiveFile.get().asFile.absolutePath}")
|
jvmArgs("-javaagent:${shadowJar.get().archiveFile.get().asFile.absolutePath}")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Because shadow does not use default configurations
|
|
||||||
publishing {
|
|
||||||
publications {
|
|
||||||
named<MavenPublication>("maven") {
|
|
||||||
project.shadow.component(this)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fun CopySpec.isolateClasses(jars: Iterable<File>) {
|
fun CopySpec.isolateClasses(jars: Iterable<File>) {
|
||||||
|
|
Loading…
Reference in New Issue