From f688a2e4f9b16e23c8b646966dc90d377753052e Mon Sep 17 00:00:00 2001 From: Owais Kazi Date: Thu, 3 Nov 2022 15:23:51 -0700 Subject: [PATCH 1/4] Run spotless before gradle check Signed-off-by: Owais Kazi --- .github/workflows/gradle-check.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/gradle-check.yml b/.github/workflows/gradle-check.yml index 0c2e62a7dd1ab..e499b3c10be6a 100644 --- a/.github/workflows/gradle-check.yml +++ b/.github/workflows/gradle-check.yml @@ -9,7 +9,16 @@ on: types: [opened, synchronize, reopened] jobs: + spotless: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + + - name: Spotless Check + run: ./gradlew spotlessCheck gradle-check: + needs: spotless runs-on: ubuntu-latest timeout-minutes: 130 steps: From 45d1e449f61865b10c8ea4abc71d34fe0ec22257 Mon Sep 17 00:00:00 2001 From: Owais Kazi Date: Thu, 3 Nov 2022 15:37:29 -0700 Subject: [PATCH 2/4] Add precommit dependency for gradle check Signed-off-by: Owais Kazi --- .github/workflows/gradle-check.yml | 18 +++++++++++++++++- .github/workflows/precommit.yml | 19 ------------------- 2 files changed, 17 insertions(+), 20 deletions(-) delete mode 100644 .github/workflows/precommit.yml diff --git a/.github/workflows/gradle-check.yml b/.github/workflows/gradle-check.yml index e499b3c10be6a..036b26edb8518 100644 --- a/.github/workflows/gradle-check.yml +++ b/.github/workflows/gradle-check.yml @@ -17,8 +17,24 @@ jobs: - name: Spotless Check run: ./gradlew spotlessCheck - gradle-check: + precommit: needs: spotless + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ ubuntu-latest, windows-latest, macos-latest ] + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 11 + uses: actions/setup-java@v2 + with: + java-version: 11 + distribution: adopt + - name: Run Gradle + run: | + ./gradlew javadoc precommit --parallel + gradle-check: + needs: precommit runs-on: ubuntu-latest timeout-minutes: 130 steps: diff --git a/.github/workflows/precommit.yml b/.github/workflows/precommit.yml deleted file mode 100644 index e264d65cdf191..0000000000000 --- a/.github/workflows/precommit.yml +++ /dev/null @@ -1,19 +0,0 @@ -name: Gradle Precommit -on: [pull_request] - -jobs: - precommit: - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-latest, windows-latest, macos-latest] - steps: - - uses: actions/checkout@v2 - - name: Set up JDK 11 - uses: actions/setup-java@v2 - with: - java-version: 11 - distribution: adopt - - name: Run Gradle - run: | - ./gradlew javadoc precommit --parallel From 768d44664a35bbafe3d2a26f374407c0ceb49564 Mon Sep 17 00:00:00 2001 From: Owais Kazi Date: Thu, 3 Nov 2022 15:45:02 -0700 Subject: [PATCH 3/4] Updated changelog Signed-off-by: Owais Kazi --- .github/workflows/gradle-check.yml | 8 ++++---- CHANGELOG.md | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/gradle-check.yml b/.github/workflows/gradle-check.yml index 036b26edb8518..595c4f9083a5e 100644 --- a/.github/workflows/gradle-check.yml +++ b/.github/workflows/gradle-check.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Spotless Check run: ./gradlew spotlessCheck @@ -24,7 +24,7 @@ jobs: matrix: os: [ ubuntu-latest, windows-latest, macos-latest ] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up JDK 11 uses: actions/setup-java@v2 with: @@ -39,7 +39,7 @@ jobs: timeout-minutes: 130 steps: - name: Checkout OpenSearch repo - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: ref: ${{ github.event.pull_request.head.sha }} @@ -65,7 +65,7 @@ jobs: echo "pr_number=Null" >> $GITHUB_ENV - name: Checkout opensearch-build repo - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: repository: opensearch-project/opensearch-build ref: main diff --git a/CHANGELOG.md b/CHANGELOG.md index 2870ccb28e56d..f30af4315ec5c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -99,6 +99,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - OpenJDK Update (October 2022 Patch releases) ([#4997](https://github.com/opensearch-project/OpenSearch/pull/4997)) - Upgrade zookeeper dependency in hdfs-fixture ([#5007](https://github.com/opensearch-project/OpenSearch/pull/5007)) - Update Jackson to 2.14.0 ([#5105](https://github.com/opensearch-project/OpenSearch/pull/5105)) +- Runs precommit before gradle check ([#5066](https://github.com/opensearch-project/OpenSearch/pull/5066)) ### Changed - Dependency updates (httpcore, mockito, slf4j, httpasyncclient, commons-codec) ([#4308](https://github.com/opensearch-project/OpenSearch/pull/4308)) From 0e309b5d2bddc1382399a463509eecc8f9041c01 Mon Sep 17 00:00:00 2001 From: Owais Kazi Date: Mon, 7 Nov 2022 14:45:58 -0800 Subject: [PATCH 4/4] Updated ditribution Signed-off-by: Owais Kazi --- .github/workflows/gradle-check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle-check.yml b/.github/workflows/gradle-check.yml index 595c4f9083a5e..2861e52d17ca1 100644 --- a/.github/workflows/gradle-check.yml +++ b/.github/workflows/gradle-check.yml @@ -29,7 +29,7 @@ jobs: uses: actions/setup-java@v2 with: java-version: 11 - distribution: adopt + distribution: temurin - name: Run Gradle run: | ./gradlew javadoc precommit --parallel