From e7ff5cfb78ae8ad874070a9fd7ed5d2f61effae9 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Fri, 1 Sep 2023 11:16:42 -0400 Subject: [PATCH 1/3] Use var Signed-off-by: Craig Perkins --- .../main/java/org/opensearch/extensions/ExtensionsManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main/java/org/opensearch/extensions/ExtensionsManager.java b/server/src/main/java/org/opensearch/extensions/ExtensionsManager.java index 61a6e2faa09e0..0aad0f699ac36 100644 --- a/server/src/main/java/org/opensearch/extensions/ExtensionsManager.java +++ b/server/src/main/java/org/opensearch/extensions/ExtensionsManager.java @@ -429,7 +429,7 @@ TransportResponse handleExtensionRequest(ExtensionRequest extensionRequest) thro initializedExtensions.entrySet().stream().map(e -> e.getValue()).collect(Collectors.toList()) ); } else { - ExtensionDependency matchingId = new ExtensionDependency(uniqueId, Version.CURRENT); + var matchingId = new ExtensionDependency(uniqueId, Version.CURRENT); return new ExtensionDependencyResponse( initializedExtensions.entrySet() .stream() From 50f71244d784690620fa1a434ac65de93169968b Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Fri, 1 Sep 2023 11:44:12 -0400 Subject: [PATCH 2/3] Modify gradle check workflow Signed-off-by: Craig Perkins --- .github/workflows/gradle-check.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/gradle-check.yml b/.github/workflows/gradle-check.yml index b86962a5ebb49..89c78e773384d 100644 --- a/.github/workflows/gradle-check.yml +++ b/.github/workflows/gradle-check.yml @@ -1,10 +1,7 @@ name: Gradle Check (Jenkins) on: push: - branches-ignore: - - 'backport/**' - - 'create-pull-request/**' - - 'dependabot/**' + - '*' pull_request_target: types: [opened, synchronize, reopened] From a2377e281034d8bb0e215f290398c5b2d9d2e784 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Fri, 1 Sep 2023 11:49:24 -0400 Subject: [PATCH 3/3] Run check and precommit Signed-off-by: Craig Perkins --- .github/workflows/gradle-check.yml | 6 ++++-- .github/workflows/precommit.yml | 1 - 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/gradle-check.yml b/.github/workflows/gradle-check.yml index 89c78e773384d..f895dfc2c1f4d 100644 --- a/.github/workflows/gradle-check.yml +++ b/.github/workflows/gradle-check.yml @@ -1,7 +1,10 @@ name: Gradle Check (Jenkins) on: push: - - '*' + branches-ignore: + - 'backport/**' + - 'create-pull-request/**' + - 'dependabot/**' pull_request_target: types: [opened, synchronize, reopened] @@ -10,7 +13,6 @@ permissions: jobs: gradle-check: - if: github.repository == 'opensearch-project/OpenSearch' permissions: contents: read # to fetch code (actions/checkout) pull-requests: write # to create or update comment (peter-evans/create-or-update-comment) diff --git a/.github/workflows/precommit.yml b/.github/workflows/precommit.yml index 0372d57dda91f..5c4ea622c2419 100644 --- a/.github/workflows/precommit.yml +++ b/.github/workflows/precommit.yml @@ -3,7 +3,6 @@ on: [pull_request] jobs: precommit: - if: github.repository == 'opensearch-project/OpenSearch' runs-on: ${{ matrix.os }} strategy: matrix: