diff --git a/.github/workflows/gradle-check.yml b/.github/workflows/gradle-check.yml index 2861e52d17ca1..0c2e62a7dd1ab 100644 --- a/.github/workflows/gradle-check.yml +++ b/.github/workflows/gradle-check.yml @@ -9,37 +9,12 @@ 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@v3 + uses: actions/checkout@v2 with: ref: ${{ github.event.pull_request.head.sha }} @@ -65,7 +40,7 @@ jobs: echo "pr_number=Null" >> $GITHUB_ENV - name: Checkout opensearch-build repo - uses: actions/checkout@v3 + uses: actions/checkout@v2 with: repository: opensearch-project/opensearch-build ref: main diff --git a/.github/workflows/precommit.yml b/.github/workflows/precommit.yml new file mode 100644 index 0000000000000..e264d65cdf191 --- /dev/null +++ b/.github/workflows/precommit.yml @@ -0,0 +1,19 @@ +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 79ccb5163032b..dd5be81d42289 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -99,7 +99,6 @@ 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))