From 6ceeacd3817fe2019b128ff2ba9789027732ff22 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Sun, 22 Aug 2021 17:26:51 -0700 Subject: [PATCH] Fix examples build (#3899) * Fix examples build * Publish main repo artifacts locally * Sync builds * Fix init script? * Fix publishing of agent-for-testing --- .github/scripts/local.init.gradle.kts | 14 +++++--------- .github/workflows/ci.yml | 11 +++++++---- .github/workflows/pr.yml | 11 +++++++---- examples/distro/build.gradle | 8 ++++---- examples/extension/build.gradle | 8 ++++---- testing/agent-for-testing/build.gradle.kts | 13 ------------- 6 files changed, 27 insertions(+), 38 deletions(-) diff --git a/.github/scripts/local.init.gradle.kts b/.github/scripts/local.init.gradle.kts index 701a929ce4..0b8ec23a0f 100644 --- a/.github/scripts/local.init.gradle.kts +++ b/.github/scripts/local.init.gradle.kts @@ -1,10 +1,6 @@ -addListener(object : BuildAdapter() { - override fun projectsEvaluated(gradle: Gradle) { - gradle.rootProject { - repositories { - mavenLocal() - removeIf { it.name == "sonatype" } - } - } +allprojects { + repositories { + mavenLocal() + removeIf { it.name == "sonatype" } } -}) +} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 107e98562e..6547171ed4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,8 +48,8 @@ jobs: - 11 - 15 vm: - - hotspot - - openj9 + - hotspot + - openj9 fail-fast: false steps: - uses: actions/checkout@v2.3.4 @@ -192,12 +192,15 @@ jobs: path: ~/.gradle/wrapper key: ${{ runner.os }}-gradle-wrapper-cache-${{ hashFiles('examples/distro/gradle/wrapper/gradle-wrapper.properties') }} + - name: Local publish + run: ./gradlew publishToMavenLocal + - name: Build distro - run: ./gradlew build + run: ./gradlew build --init-script ../../.github/scripts/local.init.gradle.kts working-directory: examples/distro - name: Build extension - run: ./gradlew build + run: ./gradlew build --init-script ../../.github/scripts/local.init.gradle.kts working-directory: examples/extension snapshot: diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index c5ab0292ad..be4923d880 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -54,8 +54,8 @@ jobs: - 11 - 15 vm: - - hotspot - - openj9 + - hotspot + - openj9 fail-fast: false steps: - uses: actions/checkout@v2.3.4 @@ -233,12 +233,15 @@ jobs: path: ~/.gradle/wrapper key: ${{ runner.os }}-gradle-wrapper-cache-${{ hashFiles('examples/distro/gradle/wrapper/gradle-wrapper.properties') }} + - name: Local publish + run: ./gradlew publishToMavenLocal + - name: Build distro - run: ./gradlew build + run: ./gradlew build --init-script ../../.github/scripts/local.init.gradle.kts working-directory: examples/distro - name: Build extension - run: ./gradlew build + run: ./gradlew build --init-script ../../.github/scripts/local.init.gradle.kts working-directory: examples/extension accept-pr: diff --git a/examples/distro/build.gradle b/examples/distro/build.gradle index 32a50442a9..e3aed1913a 100644 --- a/examples/distro/build.gradle +++ b/examples/distro/build.gradle @@ -8,10 +8,10 @@ subprojects { ext { versions = [ - opentelemetry : "1.4.1", - opentelemetryAlpha : "1.4.1-alpha", - opentelemetryJavaagent : "1.5.0-SNAPSHOT", - opentelemetryJavaagentAlpha: "1.5.0-alpha-SNAPSHOT", + opentelemetry : "1.5.0", + opentelemetryAlpha : "1.5.0-alpha", + opentelemetryJavaagent : "1.6.0-SNAPSHOT", + opentelemetryJavaagentAlpha: "1.6.0-alpha-SNAPSHOT", bytebuddy : "1.10.18", guava : "30.1-jre" ] diff --git a/examples/extension/build.gradle b/examples/extension/build.gradle index 0a84c6440e..8db1e1406d 100644 --- a/examples/extension/build.gradle +++ b/examples/extension/build.gradle @@ -21,10 +21,10 @@ version '1.0' ext { versions = [ - opentelemetry : "1.4.1", - opentelemetryAlpha : "1.4.1-alpha", - opentelemetryJavaagent : "1.5.0-SNAPSHOT", - opentelemetryJavaagentAlpha: "1.5.0-alpha-SNAPSHOT", + opentelemetry : "1.5.0", + opentelemetryAlpha : "1.5.0-alpha", + opentelemetryJavaagent : "1.6.0-SNAPSHOT", + opentelemetryJavaagentAlpha: "1.6.0-alpha-SNAPSHOT", ] deps = [ diff --git a/testing/agent-for-testing/build.gradle.kts b/testing/agent-for-testing/build.gradle.kts index 1a4dfea234..cffd603ba2 100644 --- a/testing/agent-for-testing/build.gradle.kts +++ b/testing/agent-for-testing/build.gradle.kts @@ -70,10 +70,6 @@ project(":instrumentation").subprojects { } tasks { - jar { - enabled = false - } - val relocateJavaagentLibs by registering(ShadowJar::class) { configurations = listOf(javaagentLibs) @@ -116,15 +112,6 @@ tasks { jvmArgs("-javaagent:${shadowJar.get().archiveFile.get().asFile.absolutePath}") } } - - // Because shadow does not use default configurations - publishing { - publications { - named("maven") { - project.shadow.component(this) - } - } - } } fun CopySpec.isolateClasses(jars: Iterable) {