Skip to content

Commit 9ab36bc

Browse files
BrewTestBotdaeho-ro
authored andcommitted
opensearch 2.19.1
opensearch: skip test Signed-off-by: Rui Chen <rui@chenrui.dev>
1 parent de0031d commit 9ab36bc

File tree

1 file changed

+85
-2
lines changed

1 file changed

+85
-2
lines changed

Formula/o/opensearch.rb

+85-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
class Opensearch < Formula
22
desc "Open source distributed and RESTful search engine"
33
homepage "https://github.com/opensearch-project/OpenSearch"
4-
url "https://github.com/opensearch-project/OpenSearch/archive/refs/tags/2.19.0.tar.gz"
5-
sha256 "c94e9f793393aa6ff4eb00f0ed0dd18a9f3502d2e1c84f947dad6d5c64f1fe31"
4+
url "https://github.com/opensearch-project/OpenSearch/archive/refs/tags/2.19.1.tar.gz"
5+
sha256 "99999a392dcf90bafebfa143ed071b45662fb022dcbcfa77df802248338d3a63"
66
license "Apache-2.0"
77

88
bottle do
@@ -17,6 +17,11 @@ class Opensearch < Formula
1717
depends_on "gradle" => :build
1818
depends_on "openjdk"
1919

20+
# Fix for gradle 8.13, could be removed in the next release
21+
# We modify the patch to remove binary changes for linux
22+
# PR Ref: https://github.com/opensearch-project/OpenSearch/pull/17345
23+
patch :DATA
24+
2025
def install
2126
platform = OS.kernel_name.downcase
2227
platform += "-arm64" if Hardware::CPU.arm?
@@ -105,3 +110,81 @@ def caveats
105110
system bin/"opensearch-plugin", "list"
106111
end
107112
end
113+
114+
__END__
115+
diff --git a/build.gradle b/build.gradle
116+
index 679f7b9299248fb0f5173db8fccdfb77965e394b..187574da9e62aec063548871f5dc1a7fbf62a082 100644
117+
--- a/build.gradle
118+
+++ b/build.gradle
119+
@@ -721,7 +721,7 @@ subprojects {
120+
reporting {
121+
reports {
122+
testAggregateTestReport(AggregateTestReport) {
123+
- testType = TestSuiteType.UNIT_TEST
124+
+ testSuiteName = "test"
125+
}
126+
}
127+
}
128+
diff --git a/distribution/packages/build.gradle b/distribution/packages/build.gradle
129+
index ada19dfa38e785aed9ea01d613226d624856ebbd..d3cecde24a35dade98ed18c2d5f55dba0ee5b5b7 100644
130+
--- a/distribution/packages/build.gradle
131+
+++ b/distribution/packages/build.gradle
132+
@@ -63,7 +63,7 @@ import java.util.regex.Pattern
133+
*/
134+
135+
plugins {
136+
- id "com.netflix.nebula.ospackage-base" version "11.10.1"
137+
+ id "com.netflix.nebula.ospackage-base" version "11.11.1"
138+
}
139+
140+
void addProcessFilesTask(String type, boolean jdk) {
141+
diff --git a/gradle/code-coverage.gradle b/gradle/code-coverage.gradle
142+
index eb27dd1a76634251bceafd6fefbafd65eafd5c66..1e41f12e1cc48de3ec9bcd0078f348f3a30af8f3 100644
143+
--- a/gradle/code-coverage.gradle
144+
+++ b/gradle/code-coverage.gradle
145+
@@ -38,7 +38,7 @@ if (System.getProperty("tests.coverage")) {
146+
reporting {
147+
reports {
148+
testCodeCoverageReport(JacocoCoverageReport) {
149+
- testType = TestSuiteType.UNIT_TEST
150+
+ testSuiteName = "test"
151+
}
152+
}
153+
}
154+
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
155+
index c51246f2815f5294bd8a51b3ac25c19964577ac1..95e1a2f213a063c0f371f4eab8e67ba860be7baa 100644
156+
--- a/gradle/wrapper/gradle-wrapper.properties
157+
+++ b/gradle/wrapper/gradle-wrapper.properties
158+
@@ -11,7 +11,7 @@
159+
160+
distributionBase=GRADLE_USER_HOME
161+
distributionPath=wrapper/dists
162+
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-all.zip
163+
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
164+
zipStoreBase=GRADLE_USER_HOME
165+
zipStorePath=wrapper/dists
166+
-distributionSha256Sum=296742a352f0b20ec14b143fb684965ad66086c7810b7b255dee216670716175
167+
+distributionSha256Sum=fba8464465835e74f7270bbf43d6d8a8d7709ab0a43ce1aa3323f73e9aa0c612
168+
diff --git a/gradlew b/gradlew
169+
index f5feea6d6b116baaca5a2642d4d9fa1f47d574a7..faf93008b77e7b52e18c44e4eef257fc2f8fd76d 100755
170+
--- a/gradlew
171+
+++ b/gradlew
172+
@@ -86,8 +86,7 @@ done
173+
# shellcheck disable=SC2034
174+
APP_BASE_NAME=${0##*/}
175+
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
176+
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
177+
-' "$PWD" ) || exit
178+
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
179+
180+
# Use the maximum available, or set MAX_FD != -1 to use that value.
181+
MAX_FD=maximum
182+
@@ -206,7 +205,7 @@ fi
183+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
184+
185+
# Collect all arguments for the java command:
186+
-# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
187+
+# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
188+
# and any embedded shellness will be escaped.
189+
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
190+
# treated as '${Hostname}' itself on the command line.

0 commit comments

Comments
 (0)