From b41d6072d37aacad21df988b98a6e1665c90e658 Mon Sep 17 00:00:00 2001 From: RanbirK Date: Mon, 10 Jun 2024 00:59:31 -0700 Subject: [PATCH] AVRO-3731:[gradl- avro-plugin] Integrates software donation of gradle avro plugin (#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 Co-authored-by: Ranbir Kumar --- .github/workflows/avro-compatibility.yml | 2 ++ .github/workflows/ci.yml | 22 ++++++++++------------ .github/workflows/gradle-compatibility.yml | 2 ++ .github/workflows/java-compatibility.yml | 10 ++++++++++ .github/workflows/os-compatibility.yml | 20 +++++++++++--------- 5 files changed, 35 insertions(+), 21 deletions(-) diff --git a/.github/workflows/avro-compatibility.yml b/.github/workflows/avro-compatibility.yml index 9304f495872..e15f892d9c8 100644 --- 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 index 04029994afa..0283cea9cf0 100644 --- 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 index a2a195ded7f..0cea04c86ad 100644 --- 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 index 047e08e512d..dcaf0356b61 100644 --- 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 index 58f8e30dd76..c585d247e0d 100644 --- 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