From aa4fb9a94ff333b9c12ab08a34d37ebe9165d71d Mon Sep 17 00:00:00 2001 From: Ranbir Kumar Date: Wed, 5 Jun 2024 06:22:55 -0700 Subject: [PATCH] Refactoring --- .github/workflows/avro-compatibility.yml | 3 ++- .github/workflows/ci.yml | 3 ++- .github/workflows/gradle-compatibility.yml | 3 ++- .github/workflows/java-compatibility.yml | 15 ++++++++++----- .github/workflows/os-compatibility.yml | 4 ++-- 5 files changed, 18 insertions(+), 10 deletions(-) diff --git a/.github/workflows/avro-compatibility.yml b/.github/workflows/avro-compatibility.yml index 5aa220ae13a..e15f892d9c8 100644 --- a/.github/workflows/avro-compatibility.yml +++ b/.github/workflows/avro-compatibility.yml @@ -17,5 +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 }} --project-dir lang/java/gradle-plugin + arguments: testCompatibility -PavroVersion=${{ matrix.avro }} -PgradleVersion=${{ matrix.gradle }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5f30ec19ce4..0283cea9cf0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,5 +12,6 @@ jobs: 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 --project-dir lang/java/gradle-plugin + arguments: build diff --git a/.github/workflows/gradle-compatibility.yml b/.github/workflows/gradle-compatibility.yml index a4051d6af91..0cea04c86ad 100644 --- a/.github/workflows/gradle-compatibility.yml +++ b/.github/workflows/gradle-compatibility.yml @@ -23,5 +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 }} --project-dir lang/java/gradle-plugin + arguments: testCompatibility -PavroVersion=${{ matrix.avro }} -PgradleVersion=${{ matrix.gradle }} diff --git a/.github/workflows/java-compatibility.yml b/.github/workflows/java-compatibility.yml index f33510a13c3..dcaf0356b61 100644 --- a/.github/workflows/java-compatibility.yml +++ b/.github/workflows/java-compatibility.yml @@ -18,8 +18,9 @@ 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 }} --project-dir lang/java/gradle-plugin + arguments: testCompatibility -PavroVersion=${{ matrix.avro }} -PgradleVersion=${{ matrix.gradle }} java17: name: "Compatibility: java ${{ matrix.java }}/gradle ${{ matrix.gradle }}" runs-on: "ubuntu-latest" @@ -36,8 +37,9 @@ 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 }} --project-dir lang/java/gradle-plugin + arguments: testCompatibility -PavroVersion=${{ matrix.avro }} -PgradleVersion=${{ matrix.gradle }} java18: name: "Compatibility: java ${{ matrix.java }}/gradle ${{ matrix.gradle }}" runs-on: "ubuntu-latest" @@ -54,8 +56,9 @@ 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 }} --project-dir lang/java/gradle-plugin + arguments: testCompatibility -PavroVersion=${{ matrix.avro }} -PgradleVersion=${{ matrix.gradle }} java-19: name: "Compatibility: java ${{ matrix.java }}/gradle ${{ matrix.gradle }}" runs-on: "ubuntu-latest" @@ -73,8 +76,9 @@ 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 }} --project-dir lang/java/gradle-plugin + arguments: testCompatibility -PavroVersion=${{ matrix.avro }} -PgradleVersion=${{ matrix.gradle }} java-ea: name: "Compatibility: java ${{ matrix.java }}/gradle ${{ matrix.gradle }}" runs-on: "ubuntu-latest" @@ -93,5 +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 }} --project-dir lang/java/gradle-plugin + arguments: testCompatibility -PavroVersion=${{ matrix.avro }} -PgradleVersion=${{ matrix.gradle }} diff --git a/.github/workflows/os-compatibility.yml b/.github/workflows/os-compatibility.yml index 79823e66041..c585d247e0d 100644 --- a/.github/workflows/os-compatibility.yml +++ b/.github/workflows/os-compatibility.yml @@ -6,7 +6,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - java: [11] # Minimum supported major version + java: [11] os: [ubuntu-latest, windows-latest, macOS-latest] # All supported OS steps: - uses: actions/checkout@v3 @@ -18,4 +18,4 @@ jobs: with: build-root-directory: lang/java/gradle-plugin gradle-executable: lang/java/gradle-plugin/gradlew - arguments: test --info + arguments: test