Skip to content

Update the opensearch brew formula #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vgunawan wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Update the opensearch brew formula #2

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b44408
Update opensearch@1.3.rb
radar Jul 24, 2024
6226c1b
Update opensearch@1.3.rb
radar Jul 24, 2024
d3b0e72
Fix check and styling errors
vgunawan Jul 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
122 changes: 3 additions & 119 deletions Formula/opensearch@1.3.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,15 @@
class OpensearchAT13 < Formula
desc "Open source distributed and RESTful search engine"
homepage "https://github.com/opensearch-project/OpenSearch"
url "https://github.com/opensearch-project/OpenSearch/archive/1.3.2.tar.gz"
sha256 "3927332336e10e7a3c8fb2c8976200d313dcace6358d6a90f5221d6276f17df7"
url "https://github.com/opensearch-project/OpenSearch/archive/refs/tags/1.3.18.tar.gz"
sha256 "d04b6d0ef3fd6322505130e9a93e34bb942354f6eb331a2bdd57db8fc27daca2"
license "Apache-2.0"

bottle do
root_url "https://github.com/fatzebra/homebrew-homebrew/raw/main/Bottles"
rebuild 1
sha256 cellar: :any_skip_relocation, arm64_monterey: "cbba80f75660198cffd1d05e73b5e3df142eb1217631dd5e806b2e6de2816de0"
end
keg_only :versioned_formula

depends_on "gradle@6" => :build
depends_on "openjdk"

# Backport of https://github.com/opensearch-project/OpenSearch/pull/1668
# TODO: Remove when available in release
patch :DATA if Hardware::CPU.arm?

def install
platform = OS.kernel_name.downcase
platform += "-arm64" if Hardware::CPU.arm?
Expand Down Expand Up @@ -81,7 +73,6 @@ def caveats
EOS
end

plist_options manual: "opensearch"
service do
run opt_bin/"opensearch"
working_dir var
Expand All @@ -105,110 +96,3 @@ def caveats
system "#{bin}/opensearch-plugin", "list"
end
end

__END__
diff --git a/distribution/archives/build.gradle b/distribution/archives/build.gradle
index 2c5b91f7e135d0e4a38cf3588bc12a7f28601d39..ac70ee04444c7672981cd31b84b852bdeb17476a 100644
--- a/distribution/archives/build.gradle
+++ b/distribution/archives/build.gradle
@@ -95,6 +95,13 @@ distribution_archives {
}
}

+ darwinArm64Tar {
+ archiveClassifier = 'darwin-arm64'
+ content {
+ archiveFiles(modulesFiles('darwin-arm64'), 'tar', 'darwin', 'arm64', true)
+ }
+ }
+
noJdkDarwinTar {
archiveClassifier = 'no-jdk-darwin-x64'
content {
@@ -102,6 +109,13 @@ distribution_archives {
}
}

+ noJdkDarwinArm64Tar {
+ archiveClassifier = 'no-jdk-darwin-arm64'
+ content {
+ archiveFiles(modulesFiles('darwin-arm64'), 'tar', 'darwin', 'arm64', false)
+ }
+ }
+
freebsdTar {
archiveClassifier = 'freebsd-x64'
content {
diff --git a/distribution/archives/darwin-arm64-tar/build.gradle b/distribution/archives/darwin-arm64-tar/build.gradle
new file mode 100644
index 0000000000000000000000000000000000000000..bb3e3a302c8d6a96a319a1474e964757f5ed3f57
--- /dev/null
+++ b/distribution/archives/darwin-arm64-tar/build.gradle
@@ -0,0 +1,13 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ *
+ * Modifications Copyright OpenSearch Contributors. See
+ * GitHub history for details.
+ */
+
+// This file is intentionally blank. All configuration of the
+// distribution is done in the parent project.
diff --git a/distribution/archives/no-jdk-darwin-arm64-tar/build.gradle b/distribution/archives/no-jdk-darwin-arm64-tar/build.gradle
new file mode 100644
index 0000000000000000000000000000000000000000..bb3e3a302c8d6a96a319a1474e964757f5ed3f57
--- /dev/null
+++ b/distribution/archives/no-jdk-darwin-arm64-tar/build.gradle
@@ -0,0 +1,13 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ *
+ * Modifications Copyright OpenSearch Contributors. See
+ * GitHub history for details.
+ */
+
+// This file is intentionally blank. All configuration of the
+// distribution is done in the parent project.
diff --git a/distribution/build.gradle b/distribution/build.gradle
index 33232195973f0960f3008f42c6dde84ff410779e..356aaa269e10662872b175a1fcbb5ef30aebc96b 100644
--- a/distribution/build.gradle
+++ b/distribution/build.gradle
@@ -280,7 +280,7 @@ configure(subprojects.findAll { ['archives', 'packages'].contains(it.name) }) {
// Setup all required JDKs
project.jdks {
['darwin', 'linux', 'windows'].each { platform ->
- (platform == 'linux' ? ['x64', 'aarch64'] : ['x64']).each { architecture ->
+ (platform == 'linux' || platform == 'darwin' ? ['x64', 'aarch64'] : ['x64']).each { architecture ->
"bundled_${platform}_${architecture}" {
it.platform = platform
it.version = VersionProperties.getBundledJdk(platform)
@@ -353,7 +353,7 @@ configure(subprojects.findAll { ['archives', 'packages'].contains(it.name) }) {
}
}
def buildModules = buildModulesTaskProvider
- List excludePlatforms = ['darwin-x64', 'freebsd-x64', 'linux-x64', 'linux-arm64', 'windows-x64']
+ List excludePlatforms = ['darwin-x64', 'freebsd-x64', 'linux-x64', 'linux-arm64', 'windows-x64', 'darwin-arm64']
if (platform != null) {
excludePlatforms.remove(excludePlatforms.indexOf(platform))
} else {
diff --git a/settings.gradle b/settings.gradle
index 3fdc7ec03bf997b7b4ca11992aaa9d5c619376b9..bcf1fd5937668d8856496584b7f22cfbc831c724 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -34,6 +34,8 @@ List projects = [
'distribution:archives:windows-zip',
'distribution:archives:no-jdk-windows-zip',
'distribution:archives:darwin-tar',
+ 'distribution:archives:darwin-arm64-tar',
+ 'distribution:archives:no-jdk-darwin-arm64-tar',
'distribution:archives:no-jdk-darwin-tar',
'distribution:archives:freebsd-tar',
'distribution:archives:no-jdk-freebsd-tar',