Skip to content
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.

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

neon-local neon-storage 7765 #243

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions Formula/neon-local.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ class NeonLocal < Formula
desc "CLI for running Neon locally"
homepage "https://github.com/neondatabase/neon"
url "https://github.com/neondatabase/neon.git",
tag: "release-7614",
revision: "e5b3eb1e64c63abaf4fb0d53a370befb8562a3cd"
tag: "release-7765",
revision: "a54853abd52570dea2eaebeee3b50bc04b569330"
license "Apache-2.0"
head "https://github.com/neondatabase/neon.git", branch: "main"

Expand Down
16 changes: 5 additions & 11 deletions Formula/neon-storage.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ class NeonStorage < Formula
desc "Storage components for Neon"
homepage "https://github.com/neondatabase/neon"
url "https://github.com/neondatabase/neon.git",
tag: "release-7614",
revision: "e5b3eb1e64c63abaf4fb0d53a370befb8562a3cd"
tag: "release-7765",
revision: "a54853abd52570dea2eaebeee3b50bc04b569330"
license "Apache-2.0"
head "https://github.com/neondatabase/neon.git", branch: "main"

Expand All @@ -28,12 +28,6 @@ class NeonStorage < Formula

uses_from_macos "llvm" => :build

on_linux do
# `storage_controller` got linked with system libpq on Linux.
# Not sure how to prevent it from doing that, so just depend on it to make audit happy
depends_on "libpq"
end

def binaries
%w[
compute_ctl neon_local pagebench pagectl pageserver
Expand All @@ -52,7 +46,6 @@ def install
ENV["POSTGRES_INSTALL_DIR"] = neon_postgres.opt_libexec
ENV["POSTGRES_DISTRIB_DIR"] = neon_postgres.opt_libexec

ENV["PQ_LIB_DIR"] = neon_postgres.pg_lib_for("v16") if OS.mac?
mkdir_p libexec/"storage_controller"
cp_r "storage_controller/migrations", libexec/"storage_controller/"

Expand All @@ -70,11 +63,12 @@ def install
end

test do
(binaries - %w[pagebench wal_craft]).each do |file|
(binaries - %w[compute_ctl pagebench wal_craft]).each do |file|
system libexec/"bin"/file, "--version"
end

system libexec/"bin/wal_craft", "--help"
system libexec/"bin/compute_ctl", "--help"
system libexec/"bin/pagebench", "--help"
system libexec/"bin/wal_craft", "--help"
end
end