AVRO-3731:[gradl- avro-plugin] Integrates software donation of gradle…

… avro plugin (apache#2946) * Add initial changes to workflow files to start fixing builds * Debug os compatibility test * Debug os compatibility test * Debug os compatibility test * Refactoring --------- Co-authored-by: Ola Hungerford <[email protected]> Co-authored-by: Ranbir Kumar <[email protected]>
RanbirK · Jun 10, 2024 · b41d607 · b41d607
1 parent cd9a7a0
commit b41d607
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 21 deletions.
diff --git a/.github/workflows/avro-compatibility.yml b/.github/workflows/avro-compatibility.yml
@@ -17,4 +17,6 @@ jobs:
           java-version: ${{ matrix.java }}
       - uses: gradle/gradle-build-action@v2
         with:
+          build-root-directory: lang/java/gradle-plugin
+          gradle-executable: lang/java/gradle-plugin/gradlew
           arguments: testCompatibility -PavroVersion=${{ matrix.avro }} -PgradleVersion=${{ matrix.gradle }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -5,15 +5,13 @@ jobs:
     name: "Build"
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-java@v3
-      with:
-        distribution: "zulu"
-        java-version: 8
-    - uses: gradle/gradle-build-action@v2
-      with:
-        arguments: build
-#    - uses: codecov/codecov-action@v1
-#      with:
-#        file: ./build/reports/jacoco/test/jacocoTestReport.xml
-#        fail_ci_if_error: true
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          distribution: "zulu"
+          java-version: 8
+      - uses: gradle/gradle-build-action@v2
+        with:
+          build-root-directory: lang/java/gradle-plugin
+          gradle-executable: lang/java/gradle-plugin/gradlew
+          arguments: build
diff --git a/.github/workflows/gradle-compatibility.yml b/.github/workflows/gradle-compatibility.yml
@@ -23,4 +23,6 @@ jobs:
           java-version: ${{ matrix.java }}
       - uses: gradle/gradle-build-action@v2
         with:
+          build-root-directory: lang/java/gradle-plugin
+          gradle-executable: lang/java/gradle-plugin/gradlew
           arguments: testCompatibility -PavroVersion=${{ matrix.avro }} -PgradleVersion=${{ matrix.gradle }}
diff --git a/.github/workflows/java-compatibility.yml b/.github/workflows/java-compatibility.yml
@@ -18,6 +18,8 @@ jobs:
           java-version: ${{ matrix.java }}
       - uses: gradle/gradle-build-action@v2
         with:
+          build-root-directory: lang/java/gradle-plugin
+          gradle-executable: lang/java/gradle-plugin/gradlew
           arguments: testCompatibility -PavroVersion=${{ matrix.avro }} -PgradleVersion=${{ matrix.gradle }}
   java17:
     name: "Compatibility: java ${{ matrix.java }}/gradle ${{ matrix.gradle }}"
@@ -35,6 +37,8 @@ jobs:
           java-version: ${{ matrix.java }}
       - uses: gradle/gradle-build-action@v2
         with:
+          build-root-directory: lang/java/gradle-plugin
+          gradle-executable: lang/java/gradle-plugin/gradlew
           arguments: testCompatibility -PavroVersion=${{ matrix.avro }} -PgradleVersion=${{ matrix.gradle }}
   java18:
     name: "Compatibility: java ${{ matrix.java }}/gradle ${{ matrix.gradle }}"
@@ -52,6 +56,8 @@ jobs:
           java-version: ${{ matrix.java }}
       - uses: gradle/gradle-build-action@v2
         with:
+          build-root-directory: lang/java/gradle-plugin
+          gradle-executable: lang/java/gradle-plugin/gradlew
           arguments: testCompatibility -PavroVersion=${{ matrix.avro }} -PgradleVersion=${{ matrix.gradle }}
   java-19:
     name: "Compatibility: java ${{ matrix.java }}/gradle ${{ matrix.gradle }}"
@@ -70,6 +76,8 @@ jobs:
       - uses: gradle/gradle-build-action@v2
         continue-on-error: true
         with:
+          build-root-directory: lang/java/gradle-plugin
+          gradle-executable: lang/java/gradle-plugin/gradlew
           arguments: testCompatibility -PavroVersion=${{ matrix.avro }} -PgradleVersion=${{ matrix.gradle }}
   java-ea:
     name: "Compatibility: java ${{ matrix.java }}/gradle ${{ matrix.gradle }}"
@@ -89,4 +97,6 @@ jobs:
       - uses: gradle/gradle-build-action@v2
         continue-on-error: true
         with:
+          build-root-directory: lang/java/gradle-plugin
+          gradle-executable: lang/java/gradle-plugin/gradlew
           arguments: testCompatibility -PavroVersion=${{ matrix.avro }} -PgradleVersion=${{ matrix.gradle }}
diff --git a/.github/workflows/os-compatibility.yml b/.github/workflows/os-compatibility.yml
@@ -6,14 +6,16 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        java: [8] # Minimum supported major version
+        java: [11]
         os: [ubuntu-latest, windows-latest, macOS-latest] # All supported OS
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-java@v3
-      with:
-        distribution: "zulu"
-        java-version: ${{ matrix.java }}
-    - uses: gradle/gradle-build-action@v2
-      with:
-        arguments: test
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          distribution: zulu
+          java-version: ${{ matrix.java }}
+      - uses: gradle/gradle-build-action@v2
+        with:
+          build-root-directory: lang/java/gradle-plugin
+          gradle-executable: lang/java/gradle-plugin/gradlew
+          arguments: test