Fix examples build (#3899) (#3941)

* Fix examples build * Publish main repo artifacts locally * Sync builds * Fix init script? * Fix publishing of agent-for-testing
open-telemetry · Aug 25, 2021 · 2991cd2 · 2991cd2
1 parent a934914
commit 2991cd2
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 25 deletions.
diff --git 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
@@ -48,8 +48,8 @@ jobs:
           - 11
           - 15
         vm:
-         - hotspot
-         - openj9
+          - hotspot
+          - openj9
       fail-fast: false
     steps:
       - uses: actions/[email protected]
@@ -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
@@ -54,8 +54,8 @@ jobs:
           - 11
           - 15
         vm:
-         - hotspot
-         - openj9
+          - hotspot
+          - openj9
       fail-fast: false
     steps:
       - uses: actions/[email protected]
@@ -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
@@ -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
@@ -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 = [