From 2139e804158c34bceeb581ac01c5b562dc734485 Mon Sep 17 00:00:00 2001
From: Owais Kazi <owaiskazi19@gmail.com>
Date: Mon, 7 Nov 2022 18:53:54 -0800
Subject: [PATCH] Run precommit before gradle check (#5066)

* Run spotless before gradle check

Signed-off-by: Owais Kazi <owaiskazi19@gmail.com>

* Add precommit dependency for gradle check

Signed-off-by: Owais Kazi <owaiskazi19@gmail.com>

* Updated changelog

Signed-off-by: Owais Kazi <owaiskazi19@gmail.com>

* Updated ditribution

Signed-off-by: Owais Kazi <owaiskazi19@gmail.com>

Signed-off-by: Owais Kazi <owaiskazi19@gmail.com>
---
 .github/workflows/gradle-check.yml | 29 +++++++++++++++++++++++++++--
 .github/workflows/precommit.yml    | 19 -------------------
 CHANGELOG.md                       |  1 +
 3 files changed, 28 insertions(+), 21 deletions(-)
 delete mode 100644 .github/workflows/precommit.yml

diff --git a/.github/workflows/gradle-check.yml b/.github/workflows/gradle-check.yml
index 0c2e62a7dd1ab..2861e52d17ca1 100644
--- a/.github/workflows/gradle-check.yml
+++ b/.github/workflows/gradle-check.yml
@@ -9,12 +9,37 @@ on:
     types: [opened, synchronize, reopened]
 
 jobs:
+  spotless:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Spotless Check
+        run: ./gradlew spotlessCheck
+  precommit:
+    needs: spotless
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ ubuntu-latest, windows-latest, macos-latest ]
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up JDK 11
+        uses: actions/setup-java@v2
+        with:
+          java-version: 11
+          distribution: temurin
+      - name: Run Gradle
+        run: |
+          ./gradlew javadoc precommit --parallel
   gradle-check:
+    needs: precommit
     runs-on: ubuntu-latest
     timeout-minutes: 130
     steps:
       - name: Checkout OpenSearch repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           ref: ${{ github.event.pull_request.head.sha }}
 
@@ -40,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/.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
diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd5be81d42289..79ccb5163032b 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))