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-* 4983 #118

Closed
wants to merge 4 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
15 changes: 3 additions & 12 deletions Formula/neon-extension.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ class NeonExtension < Formula
desc "Extension enabling storage manager API and Pageserver communication"
homepage "https://github.com/neondatabase/neon"
url "https://github.com/neondatabase/neon.git",
tag: "release-4916",
revision: "01180666b0f58c5d0be9434abbd3ce2880418024"
tag: "release-4983",
revision: "6460beffcd0d9c4d4a1ed17e39295a869510d29f"
license "Apache-2.0"
head "https://github.com/neondatabase/neon.git", branch: "main"

Expand All @@ -15,16 +15,7 @@ class NeonExtension < Formula
end

depends_on "bayandin/tap/neon-postgres"

# A workaround for `FATAL: postmaster became multithreaded during startup` on macOS >= 14.2
# See https://www.postgresql.org/message-id/flat/CYMBV0OT7216.JNRUO6R6GH86%40neon.tech
on_macos do
depends_on "bayandin/tap/curl-without-ipv6"
end

on_linux do
depends_on "curl"
end
uses_from_macos "curl"

def extensions
%w[neon_walredo neon neon_rmgr neon_utils]
Expand Down
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-4916",
revision: "01180666b0f58c5d0be9434abbd3ce2880418024"
tag: "release-4983",
revision: "6460beffcd0d9c4d4a1ed17e39295a869510d29f"
license "Apache-2.0"
head "https://github.com/neondatabase/neon.git", branch: "main"

Expand Down
4 changes: 2 additions & 2 deletions Formula/neon-postgres.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ class NeonPostgres < Formula
desc "Neon's fork of PostgreSQL"
homepage "https://github.com/neondatabase/postgres"
url "https://github.com/neondatabase/neon.git",
tag: "release-4916",
revision: "01180666b0f58c5d0be9434abbd3ce2880418024"
tag: "release-4983",
revision: "6460beffcd0d9c4d4a1ed17e39295a869510d29f"
license "Apache-2.0"
head "https://github.com/neondatabase/neon.git", branch: "main"

Expand Down
14 changes: 2 additions & 12 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-4916",
revision: "01180666b0f58c5d0be9434abbd3ce2880418024"
tag: "release-4983",
revision: "6460beffcd0d9c4d4a1ed17e39295a869510d29f"
license "Apache-2.0"
head "https://github.com/neondatabase/neon.git", branch: "main"

Expand Down Expand Up @@ -41,16 +41,6 @@ def neon_postgres
end

def install
# A workaround for `FATAL: postmaster became multithreaded during startup` on macOS >= 14.2
# See https://www.postgresql.org/message-id/flat/CYMBV0OT7216.JNRUO6R6GH86%40neon.tech
if OS.mac?
inreplace "control_plane/src/endpoint.rs", "cmd.args([\"--http-port\", &self.http_address.port().to_string()])",
<<~EOS
cmd.args(["--http-port", &self.http_address.port().to_string()])
.env("DYLD_LIBRARY_PATH", "#{Formula["bayandin/tap/curl-without-ipv6"].opt_lib}")
EOS
end

ENV["BUILD_TAG"] = build.stable? ? "release-#{version}" : "dev-#{Utils.git_short_head}"
ENV["GIT_VERSION"] = Utils.git_head
ENV["POSTGRES_INSTALL_DIR"] = neon_postgres.opt_libexec
Expand Down
Loading