Skip to content

Use aarch64 packages on ARM-based CPUs #126

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

Closed
jeroenvisser101 wants to merge 2 commits into from
Closed

Use aarch64 packages on ARM-based CPUs #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
057661a
Use `aarch64` packages on ARM-based CPUs
jeroenvisser101 Jan 16, 2022
26c630f
Add support for multi-arch updates
jeroenvisser101 Jan 16, 2022
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
48 changes: 46 additions & 2 deletions .ci/update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ log() {
echo "[homebrew-updater] $1"
}

get_sha256() {
echo $(curl $1 | shasum -a 256 | cut -d ' ' -f 1)
}

update() {
FORMULA_FILE=$1
ARTIFACT_PATH=$2
Expand Down Expand Up @@ -55,6 +59,40 @@ update() {
brew uninstall --formula "$FORMULA_FILE"
}

update_multiarch() {
FORMULA_FILE=$1
X86_64_ARTIFACT_PATH=$2
AARCH64_ARTIFACT_PATH=$3

X86_64_NEW_URL="$DOWNLOAD_BASE/$X86_64_ARTIFACT_PATH?$DOWNLOAD_ARGS"
AARCH64_NEW_URL="$DOWNLOAD_BASE/$AARCH64_ARTIFACT_PATH?$DOWNLOAD_ARGS"

X86_64_SHASUM=$(get_sha256 $X86_64_NEW_URL)
AARCH64_SHASUM=$(get_sha256 $AARCH64_NEW_URL)

log "Replacing the url, version, and setting the sha256 of the formula '${FORMULA_FILE}'."
/usr/bin/sed -i '' \
-e "s~^ url \".*aarch.*\"$~ url \"$AARCH64_NEW_URL\"~" \
-e "s~^ url \".*x86_64.*\"$~ url \"$X86_64_NEW_URL\"~" \
-e "s~^ version \".*\"$~ version \"$VERSION\"~" \
-e "s~^ sha256_x86_64 = \".*\"$~ sha256_x86_64 = \"$X86_64_SHASUM\"~" \
-e "s~^ sha256_aarch64 = \".*\"$~ sha256_aarch64 = \"$AARCH64_SHASUM\"~" \
"$FORMULA_FILE"

log "Installing '${FORMULA_FILE}'."
if BREW_INSTALL_OUTPUT=$(brew install --formula "$FORMULA_FILE" 2>&1)
then
echo "$BREW_INSTALL_OUTPUT"
log "Install successful."
else
echo "$BREW_INSTALL_OUTPUT"
log "The install was unsuccessful, aborting."
exit 1
fi

brew uninstall --formula "$FORMULA_FILE"
}

log "Using brew: '$(which brew)'."

update "./Formula/apm-server-full.rb" "apm-server/apm-server-$VERSION-darwin-x86_64.tar.gz"
Expand All @@ -66,15 +104,21 @@ fi

update "./Formula/auditbeat-full.rb" "beats/auditbeat/auditbeat-$VERSION-darwin-x86_64.tar.gz"
update "./Formula/auditbeat-oss.rb" "beats/auditbeat/auditbeat-oss-$VERSION-darwin-x86_64.tar.gz"
update "./Formula/elasticsearch-full.rb" "elasticsearch/elasticsearch-$VERSION-darwin-x86_64.tar.gz"
update "./Formula/filebeat-full.rb" "beats/filebeat/filebeat-$VERSION-darwin-x86_64.tar.gz"
update "./Formula/filebeat-oss.rb" "beats/filebeat/filebeat-oss-$VERSION-darwin-x86_64.tar.gz"
update "./Formula/heartbeat-full.rb" "beats/heartbeat/heartbeat-$VERSION-darwin-x86_64.tar.gz"
update "./Formula/heartbeat-oss.rb" "beats/heartbeat/heartbeat-oss-$VERSION-darwin-x86_64.tar.gz"
update "./Formula/kibana-full.rb" "kibana/kibana-$VERSION-darwin-x86_64.tar.gz"
update "./Formula/logstash-full.rb" "logstash/logstash-$VERSION-darwin-x86_64.tar.gz"
update "./Formula/logstash-oss.rb" "logstash/logstash-oss-$VERSION-darwin-x86_64.tar.gz"
update "./Formula/metricbeat-full.rb" "beats/metricbeat/metricbeat-$VERSION-darwin-x86_64.tar.gz"
update "./Formula/metricbeat-oss.rb" "beats/metricbeat/metricbeat-oss-$VERSION-darwin-x86_64.tar.gz"
update "./Formula/packetbeat-full.rb" "beats/packetbeat/packetbeat-$VERSION-darwin-x86_64.tar.gz"
update "./Formula/packetbeat-oss.rb" "beats/packetbeat/packetbeat-oss-$VERSION-darwin-x86_64.tar.gz"

update_multiarch "./Formula/elasticsearch-full.rb" \
"elasticsearch/elasticsearch-$VERSION-darwin-x86_64.tar.gz" \
"elasticsearch/elasticsearch-$VERSION-darwin-aarch64.tar.gz"

update_multiarch "./Formula/kibana-full.rb" \
"kibana/kibana-$VERSION-darwin-x86_64.tar.gz" \
"kibana/kibana-$VERSION-darwin-aarch64.tar.gz"
21 changes: 17 additions & 4 deletions Formula/elasticsearch-full.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,18 @@
class ElasticsearchFull < Formula
desc "Distributed search & analytics engine"
homepage "https://www.elastic.co/products/elasticsearch"
url "https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-7.16.3-darwin-x86_64.tar.gz?tap=elastic/homebrew-tap"
version "7.16.3"
sha256 "213faf4db506c9781d322370ffa6d55e446788694ca41ed141138fa5dcbc4064"

sha256_aarch64 = "5829ead77ca856a1fd21bc2269dd7b0afe3daa820cfde2d17939fe40fe71c4cb"
sha256_x86_64 = "213faf4db506c9781d322370ffa6d55e446788694ca41ed141138fa5dcbc4064"
if Hardware::CPU.arm?
url "https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-7.16.3-darwin-aarch64.tar.gz?tap=elastic/homebrew-tap"
version "7.16.3"
sha256 sha256_aarch64
else
url "https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-7.16.3-darwin-x86_64.tar.gz?tap=elastic/homebrew-tap"
version "7.16.3"
sha256 sha256_x86_64
end
conflicts_with "elasticsearch"

def cluster_name
Expand Down Expand Up @@ -41,7 +50,11 @@ def install
end
bin.env_script_all_files(libexec/"bin", {})

system "codesign", "-f", "-s", "-", "#{libexec}/modules/x-pack-ml/platform/darwin-x86_64/controller.app", "--deep"
if Hardware::CPU.arm?
system "codesign", "-f", "-s", "-", "#{libexec}/modules/x-pack-ml/platform/darwin-aarch64/controller.app", "--deep"
else
system "codesign", "-f", "-s", "-", "#{libexec}/modules/x-pack-ml/platform/darwin-x86_64/controller.app", "--deep"
end
system "find", "#{libexec}/jdk.app/Contents/Home/bin", "-type", "f", "-exec", "codesign", "-f", "-s", "-", "{}", ";"
end

Expand Down
15 changes: 12 additions & 3 deletions Formula/kibana-full.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,18 @@
class KibanaFull < Formula
desc "Analytics and search dashboard for Elasticsearch"
homepage "https://www.elastic.co/products/kibana"
url "https://artifacts.elastic.co/downloads/kibana/kibana-7.16.3-darwin-x86_64.tar.gz?tap=elastic/homebrew-tap"
version "7.16.3"
sha256 "0edd4e06a021438c3531875955cabf2aba5bab49e5161f5cda087181e5d11625"

sha256_aarch64 = "dd06dfcbc54c8bff093c723aa8d166e9ff2ce8eb0382621b5060b8e77caf5ecb"
sha256_x86_64 = "0edd4e06a021438c3531875955cabf2aba5bab49e5161f5cda087181e5d11625"
if Hardware::CPU.arm?
url "https://artifacts.elastic.co/downloads/kibana/kibana-7.16.3-darwin-aarch64.tar.gz?tap=elastic/homebrew-tap"
version "7.16.3"
sha256 sha256_aarch64
else
url "https://artifacts.elastic.co/downloads/kibana/kibana-7.16.3-darwin-x86_64.tar.gz?tap=elastic/homebrew-tap"
version "7.16.3"
sha256 sha256_x86_64
end
conflicts_with "kibana"

def install
Expand Down